Merge branch 'master' into selenium-refactoring

Author: rnorth

.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

.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

.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

.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: |

.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

Pipfile.lock

@@ -82,18 +82,18 @@ 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'
 
     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'
 
-    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

core/build.gradle

@@ -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?
 

docs/index.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:

docs/modules/databases/neo4j.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