Selaa lähdekoodia

HADOOP-18687. Remove json-smart dependency. (#5549 + #5524)

Contains 

* HADOOP-18687. hadoop-auth: remove unnecessary dependency on json-smart (#5524)
 Contributed by Michiel de Jong
* HADOOP-18687. Remove json-smart dependency. (#5549).
  Contributed by PJ Fanning.
rohit-kb 2 vuotta sitten
vanhempi
commit
771c89a83a
3 muutettua tiedostoa jossa 0 lisäystä ja 23 poistoa
  1. 0 1
      LICENSE-binary
  2. 0 12
      hadoop-common-project/hadoop-auth/pom.xml
  3. 0 10
      hadoop-project/pom.xml

+ 0 - 1
LICENSE-binary

@@ -308,7 +308,6 @@ io.swagger:swagger-annotations:1.5.4
 javax.inject:javax.inject:1
 javax.inject:javax.inject:1
 net.java.dev.jna:jna:5.2.0
 net.java.dev.jna:jna:5.2.0
 net.minidev:accessors-smart:2.4.7
 net.minidev:accessors-smart:2.4.7
-net.minidev:json-smart:2.4.7
 org.apache.avro:avro:1.7.7
 org.apache.avro:avro:1.7.7
 org.apache.commons:commons-collections4:4.2
 org.apache.commons:commons-collections4:4.2
 org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-compress:1.21

+ 0 - 12
hadoop-common-project/hadoop-auth/pom.xml

@@ -110,20 +110,8 @@
           <groupId>org.bouncycastle</groupId>
           <groupId>org.bouncycastle</groupId>
           <artifactId>bcprov-jdk15on</artifactId>
           <artifactId>bcprov-jdk15on</artifactId>
         </exclusion>
         </exclusion>
-        <!-- HACK.  Transitive dependency for nimbus-jose-jwt.  Needed for
-        packaging.  Please re-check this version when updating
-        nimbus-jose-jwt.  Please read HADOOP-14903 for more details.
-        -->
-        <exclusion>
-          <groupId>net.minidev</groupId>
-          <artifactId>json-smart</artifactId>
-        </exclusion>
       </exclusions>
       </exclusions>
     </dependency>
     </dependency>
-    <dependency>
-      <groupId>net.minidev</groupId>
-      <artifactId>json-smart</artifactId>
-    </dependency>
     <dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
       <artifactId>zookeeper</artifactId>

+ 0 - 10
hadoop-project/pom.xml

@@ -213,7 +213,6 @@
     <solr.version>8.8.2</solr.version>
     <solr.version>8.8.2</solr.version>
     <openssl-wildfly.version>1.1.3.Final</openssl-wildfly.version>
     <openssl-wildfly.version>1.1.3.Final</openssl-wildfly.version>
     <woodstox.version>5.4.0</woodstox.version>
     <woodstox.version>5.4.0</woodstox.version>
-    <json-smart.version>2.4.7</json-smart.version>
     <nimbus-jose-jwt.version>9.8.1</nimbus-jose-jwt.version>
     <nimbus-jose-jwt.version>9.8.1</nimbus-jose-jwt.version>
     <nodejs.version>v12.22.1</nodejs.version>
     <nodejs.version>v12.22.1</nodejs.version>
     <yarnpkg.version>v1.22.5</yarnpkg.version>
     <yarnpkg.version>v1.22.5</yarnpkg.version>
@@ -1724,15 +1723,6 @@
         <version>${dnsjava.version}</version>
         <version>${dnsjava.version}</version>
       </dependency>
       </dependency>
 
 
-      <dependency>
-        <!-- HACK.  Transitive dependency for nimbus-jose-jwt.  Needed for
-             packaging.  Please re-check this version when updating
-             nimbus-jose-jwt.  Please read HADOOP-14903 for more details.
-          -->
-        <groupId>net.minidev</groupId>
-        <artifactId>json-smart</artifactId>
-        <version>${json-smart.version}</version>
-      </dependency>
       <dependency>
       <dependency>
         <groupId>org.skyscreamer</groupId>
         <groupId>org.skyscreamer</groupId>
         <artifactId>jsonassert</artifactId>
         <artifactId>jsonassert</artifactId>