From 85b1c017eedff4fd42431355b50374f073504e48 Mon Sep 17 00:00:00 2001
From: Szilard Nemeth <snemeth@apache.org>
Date: Tue, 12 Jan 2021 15:29:17 +0100
Subject: [PATCH] YARN-10563. Fix dependency exclusion problem in poms.
 Contributed by Peter Bacsko

---
 hadoop-project/pom.xml                        | 38 ---------------
 .../pom.xml                                   | 46 +++++++++++++++++++
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ff19abce837..6f644eb6d9c 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1755,44 +1755,6 @@
          <groupId>org.jsonschema2pojo</groupId>
          <artifactId>jsonschema2pojo-core</artifactId>
          <version>${jsonschema2pojo.version}</version>
-         <exclusions>
-           <exclusion>
-             <groupId>com.fasterxml.jackson.core</groupId>
-             <artifactId>*</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>com.fasterxml.jackson.dataformat</groupId>
-             <artifactId>*</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.codehaus.jackson</groupId>
-             <artifactId>*</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>com.google.code.gson</groupId>
-             <artifactId>gson</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>com.google.code.findbugs</groupId>
-             <artifactId>annotations</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.scala-lang</groupId>
-             <artifactId>scala-library</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>org.jsonschema2pojo</groupId>
-             <artifactId>jsonschema2pojo-scalagen</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>com.google.code.javaparser</groupId>
-             <artifactId>javaparser</artifactId>
-           </exclusion>
-           <exclusion>
-             <groupId>javax.validation</groupId>
-             <artifactId>validation-api</artifactId>
-           </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
         <groupId>org.xerial.snappy</groupId>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
index 0c6a193cc71..485da711ccf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
@@ -256,6 +256,52 @@
      <dependency>
          <groupId>org.jsonschema2pojo</groupId>
          <artifactId>jsonschema2pojo-core</artifactId>
+         <exclusions>
+           <exclusion>
+             <groupId>joda-time</groupId>
+             <artifactId>joda-time</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.google.code.findbugs</groupId>
+             <artifactId>jsr305</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.fasterxml.jackson.core</groupId>
+             <artifactId>*</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.fasterxml.jackson.dataformat</groupId>
+             <artifactId>*</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.codehaus.jackson</groupId>
+             <artifactId>*</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.google.code.gson</groupId>
+             <artifactId>gson</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.google.code.findbugs</groupId>
+             <artifactId>annotations</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.scala-lang</groupId>
+             <artifactId>scala-library</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>org.jsonschema2pojo</groupId>
+             <artifactId>jsonschema2pojo-scalagen</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.google.code.javaparser</groupId>
+             <artifactId>javaparser</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>javax.validation</groupId>
+             <artifactId>validation-api</artifactId>
+           </exclusion>
+         </exclusions>
      </dependency>
      <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>