From 1b9667df0fd7193297e545e09881f2c2db919c3e Mon Sep 17 00:00:00 2001
From: lprimak <lenny@flowlogix.com>
Date: Fri, 23 Aug 2024 21:49:59 -0500
Subject: [PATCH] bugfix(deps): remove junit bom from root

---
 integration-tests/jaxrs/tests/pom.xml        |  1 +
 integration-tests/meecrowave-support/pom.xml |  2 ++
 integration-tests/support/pom.xml            |  1 +
 pom.xml                                      | 23 ++++++++++++++------
 support/spring-boot/pom.xml                  | 19 ++++++++++++++++
 web/pom.xml                                  |  1 +
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/integration-tests/jaxrs/tests/pom.xml b/integration-tests/jaxrs/tests/pom.xml
index 0c6f949a69..14710e35e0 100644
--- a/integration-tests/jaxrs/tests/pom.xml
+++ b/integration-tests/jaxrs/tests/pom.xml
@@ -42,6 +42,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/integration-tests/meecrowave-support/pom.xml b/integration-tests/meecrowave-support/pom.xml
index 45d9ac881a..b868c4fc84 100644
--- a/integration-tests/meecrowave-support/pom.xml
+++ b/integration-tests/meecrowave-support/pom.xml
@@ -53,6 +53,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -67,6 +68,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/support/pom.xml b/integration-tests/support/pom.xml
index f843c4557b..e30341a9c9 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -121,6 +121,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index f41f4518f7..ae546b8649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -885,11 +885,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -1091,13 +1093,6 @@
             <!-- 3rd party dependencies -->
 
             <!-- ... -->
-            <dependency>
-                <groupId>org.junit</groupId>
-                <artifactId>junit-bom</artifactId>
-                <version>${junit.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>org.junit-pioneer</groupId>
                 <artifactId>junit-pioneer</artifactId>
@@ -1177,6 +1172,20 @@
                 <artifactId>log4j-core-test</artifactId>
                 <version>${log4j.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
diff --git a/support/spring-boot/pom.xml b/support/spring-boot/pom.xml
index 8e946e6b8e..28119d0a8a 100644
--- a/support/spring-boot/pom.xml
+++ b/support/spring-boot/pom.xml
@@ -36,6 +36,25 @@
         <module>spring-boot-web-starter</module>
     </modules>
 
+    <properties>
+        <junit.engine.version>1.11.0</junit.engine.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+             <groupId>org.junit.platform</groupId>
+             <artifactId>junit-platform-engine</artifactId>
+             <version>${junit.engine.version}</version>
+             <scope>test</scope>
+         </dependency>
+        <dependency>
+             <groupId>org.junit.platform</groupId>
+             <artifactId>junit-platform-commons</artifactId>
+             <version>${junit.engine.version}</version>
+             <scope>test</scope>
+         </dependency>
+    </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/web/pom.xml b/web/pom.xml
index 58ce629408..e29be4bc5c 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -92,6 +92,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>