Merge branch 'master' into selenium-refactoring

Author: kiview

.github/workflows/ci-examples.yml

@@ -7,6 +7,8 @@ on:
 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:
@@ -15,12 +17,12 @@ 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
       - name: Cache Gradle Home files
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -43,12 +45,12 @@ 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
       - name: Cache Gradle Home files
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         continue-on-error: true
         with:
           path: ~/.gradle/caches

.github/workflows/ci.yml

@@ -7,6 +7,8 @@ on:
 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:
@@ -23,12 +25,12 @@ 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
       - name: Cache Gradle Home files
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
@@ -49,12 +51,12 @@ 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
       - name: Cache Gradle Home files
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         continue-on-error: true
         with:
           path: ~/.gradle/caches
@@ -73,4 +75,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
+          THUNDRA_AGENT_REPORT_REST_BASEURL: https://collector.thundra.us/v1

.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

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

.gitignore

@@ -64,3 +64,6 @@ src/mkdocs-codeinclude-plugin
 src/pip-delete-this-directory.txt
 
 .DS_Store
+
+# Codespaces / VSCode
+/.vscode/

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 {

core/build.gradle

@@ -53,20 +53,20 @@ configurations.all {
 }
 
 dependencies {
-    baseline 'org.testcontainers:testcontainers:1.16.0', {
+    baseline 'org.testcontainers:testcontainers:1.16.2', {
         exclude group: "*", module: "*"
     }
 
     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')
     }
 
-    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')
@@ -90,10 +90,10 @@ 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:3.12.4') {
+    testImplementation ('org.mockito:mockito-core:4.1.0') {
         exclude(module: 'hamcrest-core')
     }
     // Synthetic JAR used for MountableFileTest and DirectoryTarResourceTest

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);
             }

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()

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](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
@@ -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'