From 3838dfe1d8f87db5c9d22af55ce084dac067079c Mon Sep 17 00:00:00 2001
From: HyukjinKwon <gurwls223@apache.org>
Date: Thu, 22 Oct 2020 23:42:26 +0900
Subject: [PATCH 1/2] Fix `YarnClusterSuite.yarn-cluster should respect conf
 overrides in SparkHadoopUtil`

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

diff --git a/pom.xml b/pom.xml
index 8b2130f2d9f5..65800beb5a26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,6 +372,18 @@
       <artifactId>junit-interface</artifactId>
       <scope>test</scope>
     </dependency>
+    <!--
+      Hack to exclude org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:tests.
+      For some reasons, SBT starts to pull the dependencies of 'hadoop-yarn-server-tests' above
+      with 'tests' classifier after upgrading SBT 1.3 (SPARK-21708). Otherwise, some tests might
+      fail, see also SPARK-33104.
+    -->
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+      <version>${yarn.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
@@ -1399,6 +1411,10 @@
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>*</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>

From 00c83357dea94e122733cbdf7001d8fde382186d Mon Sep 17 00:00:00 2001
From: HyukjinKwon <gurwls223@apache.org>
Date: Fri, 23 Oct 2020 14:48:32 +0900
Subject: [PATCH 2/2] Narrow down only to Hadoop 2 profile

---
 pom.xml                        | 24 ++++++++++++------------
 resource-managers/yarn/pom.xml |  9 +++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 65800beb5a26..2c6f458ee25f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,18 +372,6 @@
       <artifactId>junit-interface</artifactId>
       <scope>test</scope>
     </dependency>
-    <!--
-      Hack to exclude org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:tests.
-      For some reasons, SBT starts to pull the dependencies of 'hadoop-yarn-server-tests' above
-      with 'tests' classifier after upgrading SBT 1.3 (SPARK-21708). Otherwise, some tests might
-      fail, see also SPARK-33104.
-    -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
-      <version>${yarn.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
@@ -1417,6 +1405,18 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <!--
+        Hack to exclude org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:tests.
+        For some reasons, SBT starts to pull the dependencies of 'hadoop-yarn-server-tests' above
+        with 'tests' classifier after upgrading SBT 1.3 (SPARK-21708). Otherwise, some tests might
+        fail, see also SPARK-33104.
+      -->
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+        <version>${yarn.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-yarn-server-web-proxy</artifactId>
diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml
index da715c6bdc59..f6d6ddccc99c 100644
--- a/resource-managers/yarn/pom.xml
+++ b/resource-managers/yarn/pom.xml
@@ -65,6 +65,15 @@
           <classifier>tests</classifier>
           <scope>test</scope>
         </dependency>
+        <!--
+          Hack to exclude org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:tests.
+          See the parent pom.xml for more details.
+        -->
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>