Bladeren bron

YARN-10563. Fix dependency exclusion problem in poms. Contributed by Peter Bacsko

Szilard Nemeth 4 jaren geleden
bovenliggende
commit
85b1c017ee

+ 0 - 38
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>

+ 46 - 0
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>