From c4b5ac9eade43366c75a3d13b8381f576d60b1be Mon Sep 17 00:00:00 2001
From: Nihal Jain <nihaljain@apache.org>
Date: Wed, 14 Feb 2024 00:21:01 +0530
Subject: [PATCH] HBASE-28311 Few ITs (using MiniMRYarnCluster on hadoop-2) are
 failing due to NCDFE: com/sun/jersey/core/util/FeaturesAndProperties
 (#5674)(#5625)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit 1586ae1d782a0c9ec6ef8f1e850376ce366ba396)
---
 hbase-it/pom.xml | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 30e5fdbdc9a4..b7a226f34d52 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -110,19 +110,6 @@
       <artifactId>${compat.module}</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-testing-util</artifactId>
-      <exclusions>
-        <!--This dependency pulls in hadoop-minicluster
-             which pulls in the below. It messes up
-             this build at assembly time. See HBASE-22029-->
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-endpoint</artifactId>
@@ -388,6 +375,13 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minikdc</artifactId>
         </dependency>
+        <!-- ITs using MiniMRYarnCluster fail with NCDFE, so adding this here. We are not having
+        same exclusions as in hadoop-3 profile, as for hadoop-3 it runs fine even with exclusions.
+        See HBASE-28311 for details. -->
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-testing-util</artifactId>
+        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -452,6 +446,19 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minikdc</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.apache.hbase</groupId>
+          <artifactId>hbase-testing-util</artifactId>
+          <exclusions>
+            <!--This dependency pulls in hadoop-minicluster
+                 which pulls in the below. It messes up
+                 this build at assembly time. See HBASE-22029-->
+            <exclusion>
+              <groupId>com.sun.jersey</groupId>
+              <artifactId>jersey-core</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
       </dependencies>
       <build>
         <plugins>