Merge branch 'main' into java-25

Author: eddumelendez

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

.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"
@@ -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

@@ -30,6 +30,7 @@ shadowJar {
 }
 
 task jarFileTest(type: Test) {
+    useJUnitPlatform()
     testClassesDirs = sourceSets.jarFileTest.output.classesDirs
     classpath = sourceSets.jarFileTest.runtimeClasspath
 
@@ -48,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 = []
@@ -68,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'
@@ -105,6 +125,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,7 +147,8 @@ dependencies {
 
     jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
     jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
-    jarFileTestImplementation 'junit:junit:4.13.2'
+    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.ow2.asm:asm-debug-all:5.2'
 }
@@ -135,3 +159,14 @@ tasks.generatePomFileForMavenJavaPublication.finalizedBy(
         ]
     }
 )
+
+compileTestJava {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+    options.release.set(17)
+}
+
+test {
+    useJUnitPlatform()
+}

core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java

@@ -1,25 +1,25 @@
 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;
 import java.nio.file.Path;
 
 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."));
     }

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,23 +30,22 @@
 
 /**
  * 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);
         Assertions.registerFormatterForType(FieldNode.class, it -> it.name);
         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,41 +84,43 @@ 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
             case "org/testcontainers/dockerclient/UnixSocketClientProviderStrategy":
             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));

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