From b8658ba76e8f1cf9503824e723fabd5f39faf86c Mon Sep 17 00:00:00 2001
From: Andreas Hufler <andreas.hufler@aboutbits.it>
Date: Wed, 11 Sep 2024 13:49:36 +0200
Subject: [PATCH 1/3] remove unwanted dependencies

---
 pom.xml                                              | 10 ++++++++++
 src/test/java/org/junit/rules/TestRule.java          | 10 ++++++++++
 src/test/java/org/junit/runners/model/Statement.java | 10 ++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 src/test/java/org/junit/rules/TestRule.java
 create mode 100644 src/test/java/org/junit/runners/model/Statement.java

diff --git a/pom.xml b/pom.xml
index 4d78bfe..03072f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -123,6 +129,10 @@
                     <groupId>org.hamcrest</groupId>
                     <artifactId>hamcrest-library</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/src/test/java/org/junit/rules/TestRule.java b/src/test/java/org/junit/rules/TestRule.java
new file mode 100644
index 0000000..284f394
--- /dev/null
+++ b/src/test/java/org/junit/rules/TestRule.java
@@ -0,0 +1,10 @@
+package org.junit.rules;
+
+/**
+ * This is required by Testcontainers but actually unused.
+ * By defining this here, we can avoid loading Junit-4.
+ * See: https://github.com/testcontainers/testcontainers-java/issues/970
+ */
+@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
new file mode 100644
index 0000000..f291128
--- /dev/null
+++ b/src/test/java/org/junit/runners/model/Statement.java
@@ -0,0 +1,10 @@
+package org.junit.runners.model;
+
+/**
+ * This is required by Testcontainers but actually unused.
+ * By defining this here, we can avoid loading Junit-4.
+ * See: https://github.com/testcontainers/testcontainers-java/issues/970
+ */
+@SuppressWarnings("unused")
+public class Statement {
+}

From 64e46794744c86a231bc01fcddc5c97cf3e77ea3 Mon Sep 17 00:00:00 2001
From: Andreas Hufler <andreas.hufler@aboutbits.it>
Date: Thu, 26 Sep 2024 15:14:23 +0200
Subject: [PATCH 2/3] edit comments

---
 pom.xml                                              | 2 ++
 src/test/java/org/junit/rules/TestRule.java          | 2 +-
 src/test/java/org/junit/runners/model/Statement.java | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 03072f1..63240c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,8 @@
                     <artifactId>hamcrest-library</artifactId>
                 </exclusion>
                 <exclusion>
+                    <!-- see: https://github.com/testcontainers/testcontainers-java/issues/970#issuecomment-625044008 -->
+                    <!-- can be removed once testcontainers drop their dependency to junit4 -->
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
                 </exclusion>
diff --git a/src/test/java/org/junit/rules/TestRule.java b/src/test/java/org/junit/rules/TestRule.java
index 284f394..e499646 100644
--- a/src/test/java/org/junit/rules/TestRule.java
+++ b/src/test/java/org/junit/rules/TestRule.java
@@ -3,7 +3,7 @@
 /**
  * This is required by Testcontainers but actually unused.
  * By defining this here, we can avoid loading Junit-4.
- * See: https://github.com/testcontainers/testcontainers-java/issues/970
+ * See: https://github.com/testcontainers/testcontainers-java/issues/970#issuecomment-625044008
  */
 @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
index f291128..2a72b00 100644
--- a/src/test/java/org/junit/runners/model/Statement.java
+++ b/src/test/java/org/junit/runners/model/Statement.java
@@ -3,7 +3,7 @@
 /**
  * This is required by Testcontainers but actually unused.
  * By defining this here, we can avoid loading Junit-4.
- * See: https://github.com/testcontainers/testcontainers-java/issues/970
+ * See: https://github.com/testcontainers/testcontainers-java/issues/970#issuecomment-625044008
  */
 @SuppressWarnings("unused")
 public class Statement {

From 4ee7692a7a514d2067d10be35c86191f1c14325d Mon Sep 17 00:00:00 2001
From: Andreas Hufler <andreas.hufler@aboutbits.it>
Date: Thu, 26 Sep 2024 15:14:39 +0200
Subject: [PATCH 3/3] bump version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63240c8..e3ef8a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>