Moves Junit 4 support from core to separate module

Module is named testcontainers-junit4 instead of junit4 because it fails
when building examples with
"> Module version 'org.testcontainers:junit4' is not unique in composite: can be provided by [project :testcontainers-java:docs:examples:junit4, project "

Seems related to gradle/gradle#12872

Author: froque

.github/dependabot.yml

@@ -238,6 +238,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/testcontainers-junit4"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
   - package-ecosystem: "gradle"
     directory: "/modules/tidb"
     schedule:

.github/labeler.yml

@@ -35,6 +35,8 @@
   - modules/jdbc/*
 "modules/jupiter":
   - modules/junit-jupiter/**/*
+"modules/junit4":
+  - modules/testcontainers-junit4/**/*
 "modules/k3s":
   - modules/k3s/**/*
 "modules/kafka":

README.md

@@ -2,7 +2,7 @@
 
 [![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.
+> Testcontainers is a Java library that supports JUnit and Spock 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)
 

config/checkstyle/checkstyle.xml

@@ -31,6 +31,7 @@
                       org.assertj.core.api.Assumptions.*,
                       org.awaitility.Awaitility.*,
                       org.junit.Assume.*,
+                      org.junit.jupiter.api.Assumptions.*,
                       org.mockito.Mockito.*,
                       org.mockito.ArgumentMatchers.*,
                       org.mockserver.model.HttpRequest.*,

core/build.gradle

@@ -66,7 +66,6 @@ configurations.all {
 }
 
 dependencies {
-    api 'junit:junit:4.13.2'
     api 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'org.jetbrains:annotations:23.0.0'
     testCompileOnly 'org.jetbrains:annotations:23.0.0'
@@ -96,6 +95,7 @@ dependencies {
     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 "junit:junit:4.13.2"
 
     testImplementation ('org.mockito:mockito-core:4.9.0') {
         exclude(module: 'hamcrest-core')

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -16,8 +16,6 @@
 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;
@@ -66,9 +64,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 {
 
     /**
      * Random identifier which will become part of spawned containers names, so we can shut them down
@@ -149,32 +145,6 @@ public DockerComposeContainer(String identifier, List<File> composeFiles) {
         this.dockerClient = DockerClientFactory.lazyClient();
     }
 
-    @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) {

core/src/main/java/org/testcontainers/containers/FailureDetectingExternalResource.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.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
 import org.rnorth.ducttape.unreliables.Unreliables;
@@ -53,8 +51,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;
@@ -107,7 +103,6 @@
  */
 @Data
 public class GenericContainer<SELF extends GenericContainer<SELF>>
-    extends FailureDetectingExternalResource
     implements Container<SELF>, AutoCloseable, WaitStrategyTarget, Startable {
 
     private static final Charset UTF8 = Charset.forName("UTF-8");
@@ -1065,57 +1060,6 @@ public void addExposedPorts(int... 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}
      */

core/src/main/java/org/testcontainers/containers/GenericContainer.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();
 
@@ -93,11 +91,6 @@ private String create() {
             return createNetworkCmd.exec().getId();
         }
 
-        @Override
-        protected void after() {
-            close();
-        }
-
         @Override
         public synchronized void close() {
             if (initialized.getAndSet(false)) {