Merge branch 'testcontainers:main' into main

Author: cetindogu

.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

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

.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,9 +20,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: "${{ 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
     continue-on-error: true
@@ -28,6 +34,7 @@ jobs:
         id: setup_docker
         uses: docker/setup-docker-action@v4
         with:
+          version: ${{ matrix.version }}
           channel: ${{ matrix.channel }}
           rootless: ${{ matrix.rootless }}
 

.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

.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

.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

.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

.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

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"
@@ -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") {
@@ -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 {

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 = []
 }
@@ -107,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"
 
@@ -149,7 +122,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'
 }