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

madhan pushed a commit to branch ranger-2.6
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.6 by this push:
     new 93c88841a RANGER-5075: fix for plugin installation failures due to 
missing libraries
93c88841a is described below

commit 93c88841a4c660bc88dfabc8c3568c19bbe022f2
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Tue Dec 17 16:07:19 2024 -0800

    RANGER-5075: fix for plugin installation failures due to missing libraries
---
 credentialbuilder/pom.xml                         |  5 +++
 distro/pom.xml                                    | 36 +++++++++++++++++++++
 distro/src/main/assembly/hbase-agent.xml          | 12 +++----
 distro/src/main/assembly/hdfs-agent.xml           | 14 ++++-----
 distro/src/main/assembly/hive-agent.xml           | 14 ++++-----
 distro/src/main/assembly/kms.xml                  | 14 ++++-----
 distro/src/main/assembly/knox-agent.xml           | 14 ++++-----
 distro/src/main/assembly/plugin-atlas.xml         | 28 +++++------------
 distro/src/main/assembly/plugin-elasticsearch.xml | 28 +++++------------
 distro/src/main/assembly/plugin-kafka.xml         | 31 ++++++------------
 distro/src/main/assembly/plugin-kms.xml           | 32 ++++++-------------
 distro/src/main/assembly/plugin-kylin.xml         | 14 +++++----
 distro/src/main/assembly/plugin-ozone.xml         | 24 +++++++-------
 distro/src/main/assembly/plugin-presto.xml        | 12 ++++---
 distro/src/main/assembly/plugin-solr.xml          | 18 +++++------
 distro/src/main/assembly/plugin-sqoop.xml         | 30 ++++++------------
 distro/src/main/assembly/plugin-trino.xml         | 14 ++++-----
 distro/src/main/assembly/plugin-yarn.xml          | 38 ++++++-----------------
 distro/src/main/assembly/storm-agent.xml          | 12 ++++---
 docs/pom.xml                                      |  2 +-
 pom.xml                                           |  1 -
 ranger-trino-plugin-shim/pom.xml                  |  2 +-
 22 files changed, 181 insertions(+), 214 deletions(-)

diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml
index 0408de3ad..f37579ea3 100644
--- a/credentialbuilder/pom.xml
+++ b/credentialbuilder/pom.xml
@@ -48,6 +48,11 @@
             <artifactId>commons-collections</artifactId>
             <version>${commons.collections.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons.logging.version}</version>
+        </dependency>
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>json-smart</artifactId>
diff --git a/distro/pom.xml b/distro/pom.xml
index 8e847d2a0..cdff8b340 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -48,6 +48,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ranger</groupId>
+            <artifactId>ldapconfigcheck</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-atlas-plugin</artifactId>
@@ -60,6 +66,18 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ranger</groupId>
+            <artifactId>ranger-authn</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ranger</groupId>
+            <artifactId>ranger-common-ha</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-elasticsearch-plugin</artifactId>
@@ -72,6 +90,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ranger</groupId>
+            <artifactId>ranger-examples-distro</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-hbase-plugin</artifactId>
@@ -126,6 +150,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ranger</groupId>
+            <artifactId>ranger-kms</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-kms-plugin</artifactId>
@@ -168,6 +198,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ranger</groupId>
+            <artifactId>ranger-metrics</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-nestedstructure-plugin</artifactId>
diff --git a/distro/src/main/assembly/hbase-agent.xml 
b/distro/src/main/assembly/hbase-agent.xml
index 37e2903a4..497f1f853 100644
--- a/distro/src/main/assembly/hbase-agent.xml
+++ b/distro/src/main/assembly/hbase-agent.xml
@@ -98,20 +98,20 @@
         <includeDependencies>true</includeDependencies>
         <unpack>false</unpack>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           <include>commons-lang:commons-lang</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-          <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
           
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.codehaus.woodstox:stax2-api</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/hdfs-agent.xml 
b/distro/src/main/assembly/hdfs-agent.xml
index 8b133d993..8ab2c2f65 100644
--- a/distro/src/main/assembly/hdfs-agent.xml
+++ b/distro/src/main/assembly/hdfs-agent.xml
@@ -49,20 +49,20 @@
         <includeDependencies>true</includeDependencies>
         <unpack>false</unpack>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           <include>commons-lang:commons-lang</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-          <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
           
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.codehaus.woodstox:stax2-api</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
      </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/hive-agent.xml 
b/distro/src/main/assembly/hive-agent.xml
index 9b9bc5b3a..c26754bbb 100644
--- a/distro/src/main/assembly/hive-agent.xml
+++ b/distro/src/main/assembly/hive-agent.xml
@@ -90,20 +90,20 @@
         <includeDependencies>true</includeDependencies>
         <unpack>false</unpack>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           <include>commons-lang:commons-lang</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-          <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
           
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.codehaus.woodstox:stax2-api</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/kms.xml b/distro/src/main/assembly/kms.xml
index 46c0edb00..a51af0182 100755
--- a/distro/src/main/assembly/kms.xml
+++ b/distro/src/main/assembly/kms.xml
@@ -334,20 +334,20 @@
                         <directoryMode>755</directoryMode>
                         <fileMode>644</fileMode>
                         <includes>
+                            
<include>com.fasterxml.woodstox:woodstox-core</include>
                             <include>commons-cli:commons-cli</include>
                             
<include>commons-collections:commons-collections</include>
-                            
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
                             
<include>commons-io:commons-io:jar:${commons.io.version}</include>
                             
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
                             
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-                            
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-                            
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+                            
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+                            
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+                            
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
                             
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-                            
<include>org.apache.ranger:ranger-plugins-cred</include>
-                            
<include>org.apache.ranger:credentialbuilder</include>
-                            <include>org.codehaus.woodstox:stax2-api</include>
-                            
<include>com.fasterxml.woodstox:woodstox-core</include>
+                            
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
                             
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+                            <include>org.codehaus.woodstox:stax2-api</include>
+                            
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
                         </includes>
                     </dependencySet>
                 </dependencySets>
diff --git a/distro/src/main/assembly/knox-agent.xml 
b/distro/src/main/assembly/knox-agent.xml
index a7906fe4f..ab21063de 100644
--- a/distro/src/main/assembly/knox-agent.xml
+++ b/distro/src/main/assembly/knox-agent.xml
@@ -103,20 +103,20 @@
         <includeDependencies>true</includeDependencies>
         <unpack>false</unpack>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           <include>commons-lang:commons-lang</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-          
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-          <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
           
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
+          
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
           
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.codehaus.woodstox:stax2-api</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/plugin-atlas.xml 
b/distro/src/main/assembly/plugin-atlas.xml
index 59b229c18..9e45d6ba2 100644
--- a/distro/src/main/assembly/plugin-atlas.xml
+++ b/distro/src/main/assembly/plugin-atlas.xml
@@ -110,38 +110,24 @@
         <directoryMode>755</directoryMode>
         <fileMode>644</fileMode>
         <includes>
+          
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
           <include>commons-logging:commons-logging</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-          
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-          <include>org.apache.ranger:ranger-plugins-cred</include>
-          <include>org.apache.ranger:credentialbuilder</include>
-          
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
-          
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
           
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
           
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
           
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.apache.ranger:ranger-plugins-cred</include>
+          
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
-
-    <moduleSet>
-      <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>org.apache.ranger:ranger-plugins-installer</include>
-        <include>org.apache.ranger:credentialbuilder</include>
-      </includes>
-      <binaries>
-        <includeDependencies>false</includeDependencies>
-        <outputDirectory>install/lib</outputDirectory>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
   </moduleSets>
 
   <fileSets>
diff --git a/distro/src/main/assembly/plugin-elasticsearch.xml 
b/distro/src/main/assembly/plugin-elasticsearch.xml
index 64a68b649..aae97eed3 100644
--- a/distro/src/main/assembly/plugin-elasticsearch.xml
+++ b/distro/src/main/assembly/plugin-elasticsearch.xml
@@ -107,10 +107,8 @@
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includes>
-        <include>org.apache.ranger:ranger-plugins-audit</include>
-        <include>org.apache.ranger:ranger-plugins-cred</include>
-        <include>org.apache.ranger:ranger-plugins-common</include>
-        <include>org.apache.ranger:ranger-elasticsearch-plugin</include>
+        <include>org.apache.ranger:ranger-plugins-installer</include>
+        <include>org.apache.ranger:credentialbuilder</include>
       </includes>
       <binaries>
         <outputDirectory>install/lib</outputDirectory>
@@ -119,34 +117,24 @@
         <directoryMode>755</directoryMode>
         <fileMode>644</fileMode>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
           
<include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
           <include>org.apache.ranger:ranger-plugins-cred</include>
-          <include>org.apache.ranger:credentialbuilder</include>
           
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
-
-    <moduleSet>
-      <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>org.apache.ranger:ranger-plugins-installer</include>
-        <include>org.apache.ranger:credentialbuilder</include>
-      </includes>
-      <binaries>
-        <outputDirectory>install/lib</outputDirectory>
-        <includeDependencies>true</includeDependencies>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
   </moduleSets>
   <fileSets>
     <!-- conf.templates for enable -->
diff --git a/distro/src/main/assembly/plugin-kafka.xml 
b/distro/src/main/assembly/plugin-kafka.xml
index 4fe600cd9..fef5dbccb 100644
--- a/distro/src/main/assembly/plugin-kafka.xml
+++ b/distro/src/main/assembly/plugin-kafka.xml
@@ -49,6 +49,7 @@
                                <directoryMode>755</directoryMode>
                                <fileMode>644</fileMode>
                                <includes>
+                                       
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
                                        
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
                                        
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
                                        
<include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include>
@@ -102,10 +103,8 @@
                <moduleSet>
                        <useAllReactorProjects>true</useAllReactorProjects>
                        <includes>
-                               
<include>org.apache.ranger:ranger-kafka-plugin</include>
-                               
<include>org.apache.ranger:ranger-plugins-audit</include>
-                               
<include>org.apache.ranger:ranger-plugins-cred</include>
-                               
<include>org.apache.ranger:ranger-plugins-common</include>
+                               
<include>org.apache.ranger:ranger-plugins-installer</include>
+                               
<include>org.apache.ranger:credentialbuilder</include>
                        </includes>
                        <binaries>
                                <outputDirectory>install/lib</outputDirectory>
@@ -114,36 +113,24 @@
                                <directoryMode>755</directoryMode>
                                <fileMode>644</fileMode>
                                <includes>
+                                       
<include>com.fasterxml.woodstox:woodstox-core</include>
                                        
<include>commons-cli:commons-cli</include>
                                        
<include>commons-collections:commons-collections</include>
-                                       
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
                                        
<include>commons-io:commons-io:jar:${commons.io.version}</include>
                                        
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
                                        
<include>commons-logging:commons-logging</include>
-                                       
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
+                                       
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+                                       
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+                                       
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
                                        
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
                                        
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+                    
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
                                        
<include>org.apache.ranger:ranger-plugins-cred</include>
-                                       
<include>org.apache.ranger:credentialbuilder</include>
                                        
<include>org.codehaus.woodstox:stax2-api</include>
-                                       
<include>com.fasterxml.woodstox:woodstox-core</include>
-                                        
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+                                       
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
                                </includes>
                        </binaries>
                </moduleSet>
-
-               <moduleSet>
-                       <useAllReactorProjects>true</useAllReactorProjects>
-                       <includes>
-                               
<include>org.apache.ranger:ranger-plugins-installer</include>
-                               
<include>org.apache.ranger:credentialbuilder</include>
-                       </includes>
-                       <binaries>
-                               <outputDirectory>install/lib</outputDirectory>
-                               <includeDependencies>false</includeDependencies>
-                               <unpack>false</unpack>
-                       </binaries>
-               </moduleSet>
        </moduleSets>
 
        <fileSets>
diff --git a/distro/src/main/assembly/plugin-kms.xml 
b/distro/src/main/assembly/plugin-kms.xml
index 605bdeff9..1529b20ad 100755
--- a/distro/src/main/assembly/plugin-kms.xml
+++ b/distro/src/main/assembly/plugin-kms.xml
@@ -80,10 +80,8 @@
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includes>
-        <include>org.apache.ranger:ranger-plugins-audit</include>
-        <include>org.apache.ranger:ranger-plugins-cred</include>
-        <include>org.apache.ranger:ranger-plugins-common</include>
-        <include>org.apache.ranger:ranger-kms-plugin</include>
+        <include>org.apache.ranger:ranger-plugins-installer</include>
+        <include>org.apache.ranger:credentialbuilder</include>
       </includes>
       <binaries>
         <outputDirectory>install/lib</outputDirectory>
@@ -92,36 +90,24 @@
         <directoryMode>755</directoryMode>
         <fileMode>644</fileMode>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
           <include>org.apache.ranger:ranger-plugins-cred</include>
-          <include>org.apache.ranger:credentialbuilder</include>
           <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
-          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
-
-    <moduleSet>
-      <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>org.apache.ranger:ranger-plugins-installer</include>
-        <include>org.apache.ranger:credentialbuilder</include>
-      </includes>
-      <binaries>
-        <outputDirectory>install/lib</outputDirectory>
-        <includeDependencies>false</includeDependencies>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
   </moduleSets>
 
   <fileSets>
diff --git a/distro/src/main/assembly/plugin-kylin.xml 
b/distro/src/main/assembly/plugin-kylin.xml
index b4a007616..6d7b29c8b 100644
--- a/distro/src/main/assembly/plugin-kylin.xml
+++ b/distro/src/main/assembly/plugin-kylin.xml
@@ -90,20 +90,22 @@
             <directoryMode>755</directoryMode>
             <fileMode>644</fileMode>
             <includes>
+              <include>com.fasterxml.woodstox:woodstox-core</include>
               <include>commons-cli:commons-cli</include>
               <include>commons-collections:commons-collections</include>
-              
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
               
<include>commons-io:commons-io:jar:${commons.io.version}</include>
               
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
               
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-              <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-              
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+              
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+              
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+              
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
               
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-              <include>org.apache.ranger:ranger-plugins-cred</include>
+              
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+              
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
               <include>org.apache.ranger:credentialbuilder</include>
+              <include>org.apache.ranger:ranger-plugins-cred</include>
               <include>org.codehaus.woodstox:stax2-api</include>
-              <include>com.fasterxml.woodstox:woodstox-core</include>
-              
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+              <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
             </includes>
           </dependencySet>
         </dependencySets>
diff --git a/distro/src/main/assembly/plugin-ozone.xml 
b/distro/src/main/assembly/plugin-ozone.xml
index 5f1e6a538..110b24a5b 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -49,25 +49,27 @@
                 <includeDependencies>true</includeDependencies>
                 <unpack>false</unpack>
                 <includes>
-                           
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-                    
<include>commons-configuration:commons-configuration:jar:${commons.configuration1.version}</include>
+                    
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
+                    <include>com.kstruct:gethostname4j</include>
+                    <include>com.sun.jersey:jersey-bundle</include>
+                    <include>com.sun.jersey:jersey-core</include>
+                    <include>com.sun.jersey:jersey-client</include>
                     <include>commons-cli:commons-cli</include>
                     <include>commons-collections:commons-collections</include>
+                    
<include>commons-configuration:commons-configuration:jar:${commons.configuration1.version}</include>
                     
<include>commons-io:commons-io:jar:${commons.io.version}</include>
                     <include>commons-lang:commons-lang</include>
                     
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-                    
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-                    
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
-                    
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-                    
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
-                    
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
-                    <include>com.sun.jersey:jersey-core</include>
-                    <include>com.sun.jersey:jersey-client</include>
-                    <include>com.sun.jersey:jersey-bundle</include>
-                    <include>com.kstruct:gethostname4j</include>
                     <include>net.java.dev.jna:jna</include>
                     <include>net.java.dev.jna:jna-platform</include>
+                    
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+                    
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+                    
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
+                    
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+                    
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
                     
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+                    
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
+                    
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
                 </includes>
             </binaries>
         </moduleSet>
diff --git a/distro/src/main/assembly/plugin-presto.xml 
b/distro/src/main/assembly/plugin-presto.xml
index e4101237a..3818f4556 100644
--- a/distro/src/main/assembly/plugin-presto.xml
+++ b/distro/src/main/assembly/plugin-presto.xml
@@ -135,18 +135,20 @@
                 <includeDependencies>true</includeDependencies>
                 <unpack>false</unpack>
                 <includes>
+                    <include>com.fasterxml.woodstox:woodstox-core</include>
                     <include>commons-cli:commons-cli</include>
                     <include>commons-collections:commons-collections</include>
-                    
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
                     
<include>commons-io:commons-io:jar:${commons.io.version}</include>
                     <include>commons-lang:commons-lang</include>
                     
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-                    
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-                    
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+                    
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+                    
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+                    
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
                     
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-                    <include>org.codehaus.woodstox:stax2-api</include>
-                    <include>com.fasterxml.woodstox:woodstox-core</include>
+                    
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
                     
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+                    <include>org.codehaus.woodstox:stax2-api</include>
+                    
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
                 </includes>
             </binaries>
         </moduleSet>
diff --git a/distro/src/main/assembly/plugin-solr.xml 
b/distro/src/main/assembly/plugin-solr.xml
index b1b110421..5f1b351d2 100644
--- a/distro/src/main/assembly/plugin-solr.xml
+++ b/distro/src/main/assembly/plugin-solr.xml
@@ -81,7 +81,8 @@
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includes>
-        <include>org.apache.ranger:ranger-plugins-cred</include>
+        <include>org.apache.ranger:ranger-plugins-installer</include>
+        <include>org.apache.ranger:credentialbuilder</include>
       </includes>
       <binaries>
         <outputDirectory>install/lib</outputDirectory>
@@ -90,21 +91,22 @@
         <directoryMode>755</directoryMode>
         <fileMode>644</fileMode>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
           <include>commons-logging:commons-logging</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
           <include>org.apache.ranger:ranger-plugins-cred</include>
-          <include>org.apache.ranger:credentialbuilder</include>
           <include>org.apache.ranger:ranger-solr-plugin</include>
           <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
-          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
@@ -112,8 +114,6 @@
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includes>
-        <include>org.apache.ranger:ranger-plugins-installer</include>
-        <include>org.apache.ranger:credentialbuilder</include>
       </includes>
       <binaries>
         <outputDirectory>install/lib</outputDirectory>
diff --git a/distro/src/main/assembly/plugin-sqoop.xml 
b/distro/src/main/assembly/plugin-sqoop.xml
index 2230d9067..071b873e1 100644
--- a/distro/src/main/assembly/plugin-sqoop.xml
+++ b/distro/src/main/assembly/plugin-sqoop.xml
@@ -85,8 +85,8 @@
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includes>
-        <include>org.apache.ranger:ranger-plugins-audit</include>
-        <include>org.apache.ranger:ranger-plugins-cred</include>
+        <include>org.apache.ranger:ranger-plugins-installer</include>
+        <include>org.apache.ranger:credentialbuilder</include>
       </includes>
       <binaries>
         <outputDirectory>install/lib</outputDirectory>
@@ -95,36 +95,24 @@
         <directoryMode>755</directoryMode>
         <fileMode>644</fileMode>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
           <include>org.apache.ranger:ranger-plugins-cred</include>
-          <include>org.apache.ranger:credentialbuilder</include>
           <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
-          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
-
-    <moduleSet>
-      <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>org.apache.ranger:ranger-plugins-installer</include>
-        <include>org.apache.ranger:credentialbuilder</include>
-      </includes>
-      <binaries>
-        <outputDirectory>install/lib</outputDirectory>
-        <includeDependencies>false</includeDependencies>
-        <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
   </moduleSets>
 
   <fileSets>
diff --git a/distro/src/main/assembly/plugin-trino.xml 
b/distro/src/main/assembly/plugin-trino.xml
index 16e2ddec7..b889884af 100644
--- a/distro/src/main/assembly/plugin-trino.xml
+++ b/distro/src/main/assembly/plugin-trino.xml
@@ -128,20 +128,20 @@
                 <includeDependencies>true</includeDependencies>
                 <unpack>false</unpack>
                 <includes>
+                    <include>com.fasterxml.woodstox:woodstox-core</include>
                     <include>commons-cli:commons-cli</include>
                     <include>commons-collections:commons-collections</include>
-                    
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
                     
<include>commons-io:commons-io:jar:${commons.io.version}</include>
                     <include>commons-lang:commons-lang</include>
-                    
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-                    
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
                     
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-                    
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-                    
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+                    
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+                    
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+                    
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
                     
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-                    <include>org.codehaus.woodstox:stax2-api</include>
-                    <include>com.fasterxml.woodstox:woodstox-core</include>
+                    
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
                     
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+                    <include>org.codehaus.woodstox:stax2-api</include>
+                    
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
                 </includes>
             </binaries>
         </moduleSet>
diff --git a/distro/src/main/assembly/plugin-yarn.xml 
b/distro/src/main/assembly/plugin-yarn.xml
index 98e2b39cb..6d469933f 100644
--- a/distro/src/main/assembly/plugin-yarn.xml
+++ b/distro/src/main/assembly/plugin-yarn.xml
@@ -87,8 +87,8 @@
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includes>
-        <include>org.apache.ranger:ranger-plugins-audit</include>
-        <include>org.apache.ranger:ranger-plugins-cred</include>
+        <include>org.apache.ranger:ranger-plugins-installer</include>
+        <include>org.apache.ranger:credentialbuilder</include>
       </includes>
       <binaries>
         <outputDirectory>install/lib</outputDirectory>
@@ -97,40 +97,22 @@
         <directoryMode>755</directoryMode>
         <fileMode>644</fileMode>
         <includes>
+          <include>com.fasterxml.woodstox:woodstox-core</include>
           <include>commons-cli:commons-cli</include>
           <include>commons-collections:commons-collections</include>
-          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
           <include>commons-io:commons-io:jar:${commons.io.version}</include>
           
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
           
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+          
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
           
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-          <include>org.apache.ranger:ranger-plugins-cred</include>
+          
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
+          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
           <include>org.apache.ranger:credentialbuilder</include>
+          <include>org.apache.ranger:ranger-plugins-cred</include>
           <include>org.codehaus.woodstox:stax2-api</include>
-          <include>com.fasterxml.woodstox:woodstox-core</include>
-          
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
-        </includes>
-      </binaries>
-    </moduleSet>
-
-    <moduleSet>
-      <useAllReactorProjects>true</useAllReactorProjects>
-      <includes>
-        <include>org.apache.ranger:ranger-plugins-installer</include>
-        <include>org.apache.ranger:credentialbuilder</include>
-      </includes>
-      <binaries>
-        <outputDirectory>install/lib</outputDirectory>
-        <includeDependencies>true</includeDependencies>
-        <unpack>false</unpack>
-        <directoryMode>755</directoryMode>
-        <fileMode>644</fileMode>
-        <includes>
-          
<include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
-          
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
-          
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
+          <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
         </includes>
       </binaries>
     </moduleSet>
diff --git a/distro/src/main/assembly/storm-agent.xml 
b/distro/src/main/assembly/storm-agent.xml
index 083bbbf22..6c8cbd6a8 100644
--- a/distro/src/main/assembly/storm-agent.xml
+++ b/distro/src/main/assembly/storm-agent.xml
@@ -111,18 +111,22 @@
             <directoryMode>755</directoryMode>
             <fileMode>644</fileMode>
             <includes>
+              <include>com.fasterxml.woodstox:woodstox-core</include>
               <include>commons-cli:commons-cli</include>
               <include>commons-collections:commons-collections</include>
               <include>commons-configuration:commons-configuration</include>
               
<include>commons-io:commons-io:jar:${commons.io.version}</include>
               
<include>commons-lang:commons-lang:jar:${commons.lang.version}</include>
               <include>commons-logging:commons-logging</include>
-              <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
-              <include>org.apache.hadoop:hadoop-common:jar</include>
+              
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
+              
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+              
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
               <include>org.apache.hadoop:hadoop-auth:jar</include>
-              <include>org.apache.ranger:ranger-plugins-cred</include>
-              <include>org.apache.ranger:credentialbuilder</include>
+              <include>org.apache.hadoop:hadoop-common:jar</include>
               
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
+              <include>org.apache.ranger:credentialbuilder</include>
+              <include>org.apache.ranger:ranger-plugins-cred</include>
+              <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
             </includes>
           </dependencySet>
           <dependencySet>
diff --git a/docs/pom.xml b/docs/pom.xml
index 265f75294..97aefb769 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -28,7 +28,7 @@
     <url>http://ranger.apache.org/</url>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.ranger</groupId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <artifactId>ranger</artifactId>
     <packaging>pom</packaging>
     <licenses>
diff --git a/pom.xml b/pom.xml
index 692873a1b..ae16a78f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1191,7 +1191,6 @@
                 <module>ugsync-util</module>
                 <module>ugsync/ldapconfigchecktool/ldapconfigcheck</module>
                 <module>unixauthclient</module>
-                <module>unixauthnative</module>
                 <module>unixauthservice</module>
             </modules>
         </profile>
diff --git a/ranger-trino-plugin-shim/pom.xml b/ranger-trino-plugin-shim/pom.xml
index cf93d350c..37b8e0ecc 100644
--- a/ranger-trino-plugin-shim/pom.xml
+++ b/ranger-trino-plugin-shim/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.ranger</groupId>
         <artifactId>ranger</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

Reply via email to