[ranger] branch master updated: RANGER-2785: Ranger Ozone plugin does not include configuration jars

[sp...@apache.org]

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

spolavarapu 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 d51ec83  RANGER-2785: Ranger Ozone plugin does not include configuration jars
d51ec83 is described below

commit d51ec831affbfb1e29215d77a2204423ab77e6d9
Author: Sailaja Polavarapu <sp...@cloudera.com>
AuthorDate: Wed Apr 8 11:18:57 2020 -0700

    RANGER-2785: Ranger Ozone plugin does not include configuration jars
---
 distro/src/main/assembly/plugin-ozone.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/distro/src/main/assembly/plugin-ozone.xml b/distro/src/main/assembly/plugin-ozone.xml
index 98ee9c1..06c9533 100644
--- a/distro/src/main/assembly/plugin-ozone.xml
+++ b/distro/src/main/assembly/plugin-ozone.xml
@@ -51,9 +51,10 @@
                 <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>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</include>
                     <include>commons-logging:commons-logging:jar:${commons.logging.version}</include>
@@ -65,7 +66,6 @@
                     <include>org.apache.hadoop:hadoop-hdds:jar:0.4.0.3.0.100.0-SNAPSHOT</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-configuration2:jar:${commons.configuration2.version}</include>
                     <include>com.sun.jersey:jersey-core</include>
                     <include>com.sun.jersey:jersey-client</include>
                     <include>com.sun.jersey:jersey-bundle</include>
@@ -92,6 +92,8 @@
                 <directoryMode>755</directoryMode>
                 <fileMode>644</fileMode>
                 <includes>
+		    <include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
+                    <include>commons-configuration:commons-configuration:jar:${commons.configuration1.version}</include>
                     <include>org.eclipse.persistence:javax.persistence</include>
                     <include>org.eclipse.persistence:eclipselink</include>
                     <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
@@ -101,7 +103,6 @@
                     <include>org.apache.solr:solr-solrj</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-configuration2:jar:${commons.configuration2.version}</include>
                     <include>com.sun.jersey:jersey-core</include>
                     <include>com.sun.jersey:jersey-client</include>
                     <include>com.sun.jersey:jersey-bundle</include>