You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2021/10/05 17:07:13 UTC

[ranger] branch master updated: RANGER-3359: Upgrade json-smart and nimbus-jose-jwt libraries

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

pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new db9b264  RANGER-3359: Upgrade json-smart and nimbus-jose-jwt libraries
db9b264 is described below

commit db9b264f61617b802b0d2fa9c3e553144fe63ae2
Author: pradeep <pr...@apache.org>
AuthorDate: Tue Oct 5 21:51:32 2021 +0530

    RANGER-3359: Upgrade json-smart and nimbus-jose-jwt libraries
---
 agents-audit/pom.xml      |  6 +++++-
 agents-common/pom.xml     | 16 +++++++++++++++
 agents-cred/pom.xml       | 16 +++++++++++++++
 credentialbuilder/pom.xml | 10 ++++++++++
 embeddedwebserver/pom.xml | 16 ++++++++++++---
 kms/pom.xml               | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml                   |  2 ++
 security-admin/pom.xml    |  4 ++--
 8 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
index 0b16e53..5607242 100644
--- a/agents-audit/pom.xml
+++ b/agents-audit/pom.xml
@@ -52,10 +52,14 @@
             <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>
             <exclusions>
-                 <exclusion>
+                <exclusion>
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index 39efb0c..c9a0b89 100644
--- a/agents-common/pom.xml
+++ b/agents-common/pom.xml
@@ -59,9 +59,25 @@
             <version>${commons.logging.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <version>${nimbus-jose-jwt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${jsonsmart.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml
index 254d0c1..b2510da 100644
--- a/agents-cred/pom.xml
+++ b/agents-cred/pom.xml
@@ -37,9 +37,25 @@
             <version>${commons.logging.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <version>${nimbus-jose-jwt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${jsonsmart.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
index 59d239b..fb1da9b 100644
--- a/credentialbuilder/pom.xml
+++ b/credentialbuilder/pom.xml
@@ -68,6 +68,16 @@
             <version>${slf4j-api.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <version>${nimbus-jose-jwt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${jsonsmart.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <version>${hadoop.version}</version>
diff --git a/embeddedwebserver/pom.xml b/embeddedwebserver/pom.xml
index 2d14f3a..30f441e 100644
--- a/embeddedwebserver/pom.xml
+++ b/embeddedwebserver/pom.xml
@@ -62,13 +62,23 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
-        </dependency>	
-	<dependency>
+        </dependency>
+        <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <version>${nimbus-jose-jwt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${jsonsmart.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-audit</artifactId>
             <version>${project.version}</version>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-common</artifactId>
             <version>${project.version}</version>
diff --git a/kms/pom.xml b/kms/pom.xml
index b65b0b2..5f712ec 100644
--- a/kms/pom.xml
+++ b/kms/pom.xml
@@ -146,6 +146,16 @@
             <artifactId>hadoop-auth</artifactId>
             <version>${hadoop.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.nimbusds</groupId>
+                    <artifactId>nimbus-jose-jwt</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
@@ -287,6 +297,16 @@
             <groupId>org.apache.ranger</groupId>
             <artifactId>credentialbuilder</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.nimbusds</groupId>
+                    <artifactId>nimbus-jose-jwt</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -302,6 +322,16 @@
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-common</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.nimbusds</groupId>
+                    <artifactId>nimbus-jose-jwt</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
@@ -361,6 +391,14 @@
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-lang3</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.nimbusds</groupId>
+                    <artifactId>nimbus-jose-jwt</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -417,6 +455,18 @@
             <artifactId>javax.persistence</artifactId>
             <version>${javax.persistence.version}</version>
         </dependency>
+        <!-- Transitive dependency for nimbus-jose-jwt. Please re-check this version
+            when updating nimbus-jose-jwt. Please read RANGER-2080 for more details. -->
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>${jsonsmart.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.nimbusds</groupId>
+            <artifactId>nimbus-jose-jwt</artifactId>
+            <version>${nimbus-jose-jwt.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <pluginManagement>
diff --git a/pom.xml b/pom.xml
index 52b6b4b..626591d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,6 +226,8 @@
         <hppc.version>0.8.0</hppc.version>
         <joda.time.version>2.10.6</joda.time.version>
         <log4j.core.version>2.13.3</log4j.core.version>
+        <jsonsmart.version>2.3.1</jsonsmart.version>
+        <nimbus-jose-jwt.version>8.22.1</nimbus-jose-jwt.version>
     </properties>
     <profiles>
         <profile>
diff --git a/security-admin/pom.xml b/security-admin/pom.xml
index 8b767f6..3e7a64f 100644
--- a/security-admin/pom.xml
+++ b/security-admin/pom.xml
@@ -544,7 +544,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>8.15</version>
+            <version>${nimbus-jose-jwt.version}</version>
             <scope>compile</scope>
         </dependency>
         <!-- Transitive dependency for nimbus-jose-jwt.
@@ -554,7 +554,7 @@
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>json-smart</artifactId>
-            <version>2.3</version>
+            <version>${jsonsmart.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>