From c58b9396cd37958277d719ac3f1d34ada67d34d6 Mon Sep 17 00:00:00 2001
From: adunai <adunai@cloudera.com>
Date: Wed, 11 Mar 2026 15:14:41 +0100
Subject: [PATCH 1/2] PHOENIX-7779: Update jUnit to 5.6 in pom.xml files

---
 phoenix-queryserver-it/pom.xml            |  4 ++--
 phoenix-queryserver-load-balancer/pom.xml |  4 ++--
 phoenix-queryserver-orchestrator/pom.xml  |  4 ++--
 phoenix-queryserver/pom.xml               |  4 ++--
 pom.xml                                   | 11 ++++++++---
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 6d3f4222..a2357319 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -124,8 +124,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/phoenix-queryserver-load-balancer/pom.xml b/phoenix-queryserver-load-balancer/pom.xml
index 44e6ebe7..e141a075 100644
--- a/phoenix-queryserver-load-balancer/pom.xml
+++ b/phoenix-queryserver-load-balancer/pom.xml
@@ -127,8 +127,8 @@
 
     <!-- for tests -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/phoenix-queryserver-orchestrator/pom.xml b/phoenix-queryserver-orchestrator/pom.xml
index 8431f506..90df7d30 100644
--- a/phoenix-queryserver-orchestrator/pom.xml
+++ b/phoenix-queryserver-orchestrator/pom.xml
@@ -96,8 +96,8 @@
         </dependency>
         <!-- test -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 345e3f96..c8f5f4e6 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -232,8 +232,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 27abb6b4..616fd41c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
         <!-- Test Dependency versions -->
         <testng.version>6.10</testng.version>
         <mockito.version>4.11.0</mockito.version>
-        <junit.version>4.13.2</junit.version>
+        <junit.version>5.10.2</junit.version>
 
         <!-- Plugin versions -->
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
@@ -1207,11 +1207,16 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-bom</artifactId>

From 9b8d37fcce1c21996ca83ee3d35ab406e664b88d Mon Sep 17 00:00:00 2001
From: adunai <adunai@cloudera.com>
Date: Wed, 11 Mar 2026 15:14:41 +0100
Subject: [PATCH 2/2] PHOENIX-7779: Update jUnit to 5.6 in pom.xml files

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 616fd41c..698245cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,6 +217,12 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
+                    <configuration>
+                        <ignoredDependencies>
+                            <ignoredDependency>junit:junit:jar:4.13.2</ignoredDependency>
+                            <ignoredDependency>org.junit.vintage:junit-vintage-engine:jar:5.10.2</ignoredDependency>
+                        </ignoredDependencies>
+                    </configuration>
                     <executions>
                         <execution>
                             <id>enforce-dependencies</id>