From 9c1f79c861a74248b772c593b33414f4bb6330e0 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon.chambers@gmail.com>
Date: Sun, 23 Mar 2025 18:27:52 -0400
Subject: [PATCH 1/2] Simplify JUnit dependencies and discard unused ones

---
 dropwizard-metrics-listener/pom.xml |  2 +-
 gson-payload-builder/pom.xml        |  2 +-
 jackson-payload-builder/pom.xml     |  2 +-
 micrometer-metrics-listener/pom.xml |  2 +-
 pom.xml                             | 12 +-----------
 pushy/pom.xml                       | 12 +-----------
 6 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/dropwizard-metrics-listener/pom.xml b/dropwizard-metrics-listener/pom.xml
index 2944ecd3f..7063da0a3 100644
--- a/dropwizard-metrics-listener/pom.xml
+++ b/dropwizard-metrics-listener/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/gson-payload-builder/pom.xml b/gson-payload-builder/pom.xml
index 56a9c1a92..af9de0d5c 100644
--- a/gson-payload-builder/pom.xml
+++ b/gson-payload-builder/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/jackson-payload-builder/pom.xml b/jackson-payload-builder/pom.xml
index 3798840d3..3d30e5c6e 100644
--- a/jackson-payload-builder/pom.xml
+++ b/jackson-payload-builder/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/micrometer-metrics-listener/pom.xml b/micrometer-metrics-listener/pom.xml
index 0a46f7ac1..df9dea479 100644
--- a/micrometer-metrics-listener/pom.xml
+++ b/micrometer-metrics-listener/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 9adf465bc..f11d7efb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,19 +120,9 @@
             <!-- Test dependencies -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
+                <artifactId>junit-jupiter</artifactId>
                 <version>${junit.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-params</artifactId>
-                <version>${junit.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.platform</groupId>
-                <artifactId>junit-platform-launcher</artifactId>
-                <version>1.6.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
diff --git a/pushy/pom.xml b/pushy/pom.xml
index d547bcc25..10289282d 100644
--- a/pushy/pom.xml
+++ b/pushy/pom.xml
@@ -59,17 +59,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

From 864d04c6fe9a3ce7c03c021652b6e86bd8c547c5 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon.chambers@gmail.com>
Date: Sun, 23 Mar 2025 18:30:14 -0400
Subject: [PATCH 2/2] Update to JUnit 5.12.1 (and Surefire 3.5.2)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f11d7efb7..62ce8617e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
 
     <properties>
         <netty.version>4.1.119.Final</netty.version>
-        <junit.version>5.6.0</junit.version>
+        <junit.version>5.12.1</junit.version>
         <slf4j.version>1.7.21</slf4j.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -242,7 +242,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.0</version>
+                    <version>3.5.2</version>
                 </plugin>
 
                 <plugin>