From 69f46765c698d19ba774e874ec3e1d7faf35a694 Mon Sep 17 00:00:00 2001
From: Sky Brewer <sky.brewer@ess.eu>
Date: Fri, 20 Feb 2026 12:23:02 +0100
Subject: [PATCH] Update test containers to 1.21.4

The dummy junit code is no longer needed as https://github.com/testcontainers/testcontainers-java/issues/970 has been fixed.
---
 pom.xml                                              | 8 +-------
 src/test/java/org/junit/rules/ExternalResource.java  | 8 --------
 src/test/java/org/junit/rules/TestRule.java          | 9 ---------
 src/test/java/org/junit/runners/model/Statement.java | 9 ---------
 4 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 src/test/java/org/junit/rules/ExternalResource.java
 delete mode 100644 src/test/java/org/junit/rules/TestRule.java
 delete mode 100644 src/test/java/org/junit/runners/model/Statement.java

diff --git a/pom.xml b/pom.xml
index 16a4a986..57ae8fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,14 +161,8 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.19.3</version>
+            <version>1.21.4</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId> <!-- Need for running tests on mac -->
diff --git a/src/test/java/org/junit/rules/ExternalResource.java b/src/test/java/org/junit/rules/ExternalResource.java
deleted file mode 100644
index 95788f48..00000000
--- a/src/test/java/org/junit/rules/ExternalResource.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.junit.rules;
-
-/**
- * "Fake" class used as a replacement for Junit4-dependent classes. See more at: <a
- * href="https://github.com/testcontainers/testcontainers-java/issues/970">GenericContainer run from
- * Jupiter tests shouldn't require JUnit 4.x library on runtime classpath </a>.
- */
-public class ExternalResource {}
diff --git a/src/test/java/org/junit/rules/TestRule.java b/src/test/java/org/junit/rules/TestRule.java
deleted file mode 100644
index 34be5cd6..00000000
--- a/src/test/java/org/junit/rules/TestRule.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.junit.rules;
-
-/**
- * "Fake" class used as a replacement for Junit4-dependent classes. See more at: <a
- * href="https://github.com/testcontainers/testcontainers-java/issues/970">GenericContainer run from
- * Jupiter tests shouldn't require JUnit 4.x library on runtime classpath </a>.
- */
-@SuppressWarnings("unused")
-public interface TestRule {}
diff --git a/src/test/java/org/junit/runners/model/Statement.java b/src/test/java/org/junit/runners/model/Statement.java
deleted file mode 100644
index 61440254..00000000
--- a/src/test/java/org/junit/runners/model/Statement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.junit.runners.model;
-
-/**
- * "Fake" class used as a replacement for Junit4-dependent classes. See more at: <a
- * href="https://github.com/testcontainers/testcontainers-java/issues/970">GenericContainer run from
- * Jupiter tests shouldn't require JUnit 4.x library on runtime classpath </a>.
- */
-@SuppressWarnings("unused")
-public class Statement {}