You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sn...@apache.org on 2021/01/12 14:30:00 UTC

[hadoop] branch trunk updated: YARN-10563. Fix dependency exclusion problem in poms. Contributed by Peter Bacsko

This is an automated email from the ASF dual-hosted git repository.

snemeth pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 85b1c01  YARN-10563. Fix dependency exclusion problem in poms. Contributed by Peter Bacsko
85b1c01 is described below

commit 85b1c017eedff4fd42431355b50374f073504e48
Author: Szilard Nemeth <sn...@apache.org>
AuthorDate: Tue Jan 12 15:29:17 2021 +0100

    YARN-10563. Fix dependency exclusion problem in poms. Contributed by Peter Bacsko
---
 hadoop-project/pom.xml                             | 38 ------------------
 .../hadoop-yarn-server-resourcemanager/pom.xml     | 46 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ff19abc..6f644eb 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 0c6a193..485da71 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>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org