This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new cd7650c13 BIGTOP-4388. Upgrade Ranger to 2.6.0. (#1337)
cd7650c13 is described below
commit cd7650c13f05a0a34811a38c58e8224aeedd0a1f
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Wed Apr 9 22:14:27 2025 +0900
BIGTOP-4388. Upgrade Ranger to 2.6.0. (#1337)
---
.../src/common/ranger/do-component-build | 1 +
.../src/common/ranger/patch0-RANGER-4201.diff | 25 --
.../src/common/ranger/patch0-RANGER-4952.diff | 361 +++++++++++++++++++++
.../src/common/ranger/patch1-RANGER-4228.diff | 26 --
.../src/common/ranger/patch2-RANGER-3992.diff | 204 ------------
.../src/common/ranger/patch4-RANGER-4511.diff | 317 ------------------
bigtop-packages/src/deb/ranger/rules | 1 -
bigtop-packages/src/rpm/ranger/SPECS/ranger.spec | 4 -
bigtop.bom | 2 +-
9 files changed, 363 insertions(+), 578 deletions(-)
diff --git a/bigtop-packages/src/common/ranger/do-component-build
b/bigtop-packages/src/common/ranger/do-component-build
index 016fa3ba7..f364dc5a7 100644
--- a/bigtop-packages/src/common/ranger/do-component-build
+++ b/bigtop-packages/src/common/ranger/do-component-build
@@ -26,6 +26,7 @@ mvn clean compile package install \
-Dpmd.skip=true \
-Drat.skip=true \
-Dspotbugs.skip=true \
+ -Denunciate.skip=true \
-Dhadoop.version=${HADOOP_VERSION} \
-Dhbase.version=${HBASE_VERSION} \
-Dhive.version=${HIVE_VERSION} \
diff --git a/bigtop-packages/src/common/ranger/patch0-RANGER-4201.diff
b/bigtop-packages/src/common/ranger/patch0-RANGER-4201.diff
deleted file mode 100644
index 09d810366..000000000
--- a/bigtop-packages/src/common/ranger/patch0-RANGER-4201.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 883bb085e25d4a082740af10b9452fb3b198532e Mon Sep 17 00:00:00 2001
-From: jialiang <[email protected]>
-Date: Sun, 23 Apr 2023 17:56:08 +0800
-Subject: [PATCH] RANGER-4201: fix Hbase master can't start due to
- ranger-hbase-plugin jersey jar class loading order
-
----
- distro/src/main/assembly/hbase-agent.xml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/distro/src/main/assembly/hbase-agent.xml
b/distro/src/main/assembly/hbase-agent.xml
-index ff53ca2c2..467f8e5d4 100644
---- a/distro/src/main/assembly/hbase-agent.xml
-+++ b/distro/src/main/assembly/hbase-agent.xml
-@@ -54,7 +54,6 @@
- <fileMode>644</fileMode>
- <includes>
-
<include>com.sun.jersey:jersey-client:jar:${jersey-bundle.version}</include>
--
<include>com.sun.jersey:jersey-core:jar:${jersey-bundle.version}</include>
-
<include>org.codehaus.jackson:jackson-jaxrs:jar:${codehaus.jackson.version}</include>
-
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
-
<include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include>
---
-2.37.0
-
diff --git a/bigtop-packages/src/common/ranger/patch0-RANGER-4952.diff
b/bigtop-packages/src/common/ranger/patch0-RANGER-4952.diff
new file mode 100644
index 000000000..2522bcbc7
--- /dev/null
+++ b/bigtop-packages/src/common/ranger/patch0-RANGER-4952.diff
@@ -0,0 +1,361 @@
+commit 58e9f95120e40f21847e5e2143958cee79bec904
+Author: Simhadri Govindappa <[email protected]>
+Date: Tue Oct 22 00:20:02 2024 +0530
+
+ RANGER-4952: Add support for Hive 4.0.1 (#400)
+
+ * RANGER-4952: Add support for Hive 4.0
+
+ * Fix unit test failure
+
+ ---------
+
+ Co-authored-by: Simhadri Govindappa <[email protected]>
+ (cherry picked from commit 50f75d7d37f993cd3e2a8ebee524f00366933f25)
+
+ Conflicts:
+ hive-agent/pom.xml
+ pom.xml
+
+diff --git
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+index ca6edf5b2..cf4052184 100644
+---
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
++++
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizer.java
+@@ -1777,7 +1777,11 @@ private HiveAccessType
getAccessType(HivePrivilegeObject hiveObj, HiveOperationT
+ accessType =
HiveAccessType.CREATE;
+ }
+ break;
+-
++ case CREATEDATACONNECTOR:
++ if(hiveObj.getType() ==
HivePrivilegeObjectType.DATACONNECTOR) {
++ accessType =
HiveAccessType.CREATE;
++ }
++ break;
+ case CREATEFUNCTION:
+ if(hiveObj.getType() ==
HivePrivilegeObjectType.FUNCTION) {
+ accessType =
HiveAccessType.CREATE;
+@@ -1805,8 +1809,7 @@ private HiveAccessType getAccessType(HivePrivilegeObject
hiveObj, HiveOperationT
+ case ALTERDATABASE:
+ case ALTERDATABASE_LOCATION:
+ case ALTERDATABASE_OWNER:
+- case ALTERINDEX_PROPS:
+- case ALTERINDEX_REBUILD:
++ // Refer - HIVE-21968
+ case ALTERPARTITION_BUCKETNUM:
+ case ALTERPARTITION_FILEFORMAT:
+ case ALTERPARTITION_LOCATION:
+@@ -1828,6 +1831,12 @@ private HiveAccessType
getAccessType(HivePrivilegeObject hiveObj, HiveOperationT
+ case ALTERTABLE_MERGEFILES:
+ case ALTERTABLE_PARTCOLTYPE:
+ case ALTERTABLE_PROPERTIES:
++ case ALTERTABLE_SETPARTSPEC:
++ case ALTERTABLE_EXECUTE:
++ case ALTERTABLE_CONVERT:
++ case ALTERDATACONNECTOR:
++ case ALTERDATACONNECTOR_OWNER:
++ case ALTERDATACONNECTOR_URL:
+ case ALTERTABLE_PROTECTMODE:
+ case ALTERTABLE_RENAME:
+ case ALTERTABLE_RENAMECOL:
+@@ -1841,28 +1850,29 @@ private HiveAccessType
getAccessType(HivePrivilegeObject hiveObj, HiveOperationT
+ case ALTERTABLE_UPDATEPARTSTATS:
+ case ALTERTABLE_UPDATETABLESTATS:
+ case ALTERTABLE_UPDATECOLUMNS:
++ case ALTERTABLE_CREATEBRANCH:
++ case ALTERTABLE_DROPBRANCH:
++ case ALTERTABLE_CREATETAG:
++ case ALTERTABLE_DROPTAG:
+ case ALTERTBLPART_SKEWED_LOCATION:
+ case ALTERVIEW_PROPERTIES:
+ case ALTERVIEW_RENAME:
+ case ALTER_MATERIALIZED_VIEW_REWRITE:
+- case DROPVIEW_PROPERTIES:
++ case ALTER_MATERIALIZED_VIEW_REBUILD:
++ // HIVE-22188
+ case MSCK:
+ accessType = HiveAccessType.ALTER;
+ break;
+
+ case DROPFUNCTION:
+- case DROPINDEX:
+ case DROPTABLE:
+ case DROPVIEW:
+ case DROP_MATERIALIZED_VIEW:
+ case DROPDATABASE:
++ case DROPDATACONNECTOR:
+ accessType = HiveAccessType.DROP;
+ break;
+-
+- case CREATEINDEX:
+- accessType = HiveAccessType.INDEX;
+- break;
+-
++ // HIVE-21968
+ case IMPORT:
+ /*
+ This can happen during hive IMPORT
command IFF a table is also being created as part of IMPORT.
+@@ -1895,7 +1905,6 @@ private HiveAccessType getAccessType(HivePrivilegeObject
hiveObj, HiveOperationT
+ case QUERY:
+ case SHOW_TABLESTATUS:
+ case SHOW_CREATETABLE:
+- case SHOWINDEXES:
+ case SHOWPARTITIONS:
+ case SHOW_TBLPROPERTIES:
+ case ANALYZE_TABLE:
+@@ -1921,9 +1930,11 @@ private HiveAccessType
getAccessType(HivePrivilegeObject hiveObj, HiveOperationT
+
+ // any access done for metadata access of
actions that have support from hive for filtering
+ case SHOWDATABASES:
++ case SHOWDATACONNECTORS:
+ case SHOW_GRANT:
+ case SWITCHDATABASE:
+ case DESCDATABASE:
++ case DESCDATACONNECTOR:
+ case SHOWTABLES:
+ case SHOWVIEWS:
+ accessType = HiveAccessType.USE;
+@@ -1972,6 +1983,8 @@ private HiveAccessType getAccessType(HivePrivilegeObject
hiveObj, HiveOperationT
+ case CREATEMACRO:
+ case CREATEROLE:
+ case DESCFUNCTION:
++ case PREPARE:
++ case EXECUTE:
+ case DFS:
+ case DROPMACRO:
+ case DROPROLE:
+@@ -2010,6 +2023,7 @@ private FsAction getURIAccessType(HiveOperationType
hiveOpType) {
+ break;
+
+ case CREATEDATABASE:
++ case CREATEDATACONNECTOR:
+ case CREATETABLE:
+ case CREATETABLE_AS_SELECT:
+ case CREATEFUNCTION:
+@@ -2029,6 +2043,12 @@ private FsAction getURIAccessType(HiveOperationType
hiveOpType) {
+ case ALTERTABLE_ARCHIVE:
+ case ALTERTABLE_UNARCHIVE:
+ case ALTERTABLE_PROPERTIES:
++ case ALTERTABLE_SETPARTSPEC:
++ case ALTERTABLE_EXECUTE:
++ case ALTERTABLE_CONVERT:
++ case ALTERDATACONNECTOR:
++ case ALTERDATACONNECTOR_OWNER:
++ case ALTERDATACONNECTOR_URL:
+ case ALTERTABLE_SERIALIZER:
+ case ALTERTABLE_PARTCOLTYPE:
+ case ALTERTABLE_DROPCONSTRAINT:
+@@ -2039,10 +2059,13 @@ private FsAction getURIAccessType(HiveOperationType
hiveOpType) {
+ case ALTERTABLE_UPDATETABLESTATS:
+ case ALTERTABLE_UPDATEPARTSTATS:
+ case ALTERTABLE_UPDATECOLUMNS:
++ case ALTERTABLE_CREATEBRANCH:
++ case ALTERTABLE_DROPBRANCH:
++ case ALTERTABLE_CREATETAG:
++ case ALTERTABLE_DROPTAG:
+ case ALTERTABLE_PROTECTMODE:
+ case ALTERTABLE_FILEFORMAT:
+ case ALTERTABLE_LOCATION:
+- case ALTERINDEX_PROPS:
+ case ALTERTABLE_MERGEFILES:
+ case ALTERTABLE_SKEWED:
+ case ALTERTABLE_COMPACT:
+@@ -2064,16 +2087,20 @@ private FsAction getURIAccessType(HiveOperationType
hiveOpType) {
+
+ case EXPLAIN:
+ case DROPDATABASE:
++ case DROPDATACONNECTOR:
+ case SWITCHDATABASE:
+ case LOCKDB:
+ case UNLOCKDB:
+ case DROPTABLE:
+ case DESCTABLE:
+ case DESCFUNCTION:
++ case PREPARE:
++ case EXECUTE:
+ case MSCK:
+ case ANALYZE_TABLE:
+ case CACHE_METADATA:
+ case SHOWDATABASES:
++ case SHOWDATACONNECTORS:
+ case SHOWTABLES:
+ case SHOWCOLUMNS:
+ case SHOW_TABLESTATUS:
+@@ -2082,7 +2109,6 @@ private FsAction getURIAccessType(HiveOperationType
hiveOpType) {
+ case SHOW_CREATETABLE:
+ case SHOWFUNCTIONS:
+ case SHOWVIEWS:
+- case SHOWINDEXES:
+ case SHOWPARTITIONS:
+ case SHOWLOCKS:
+ case SHOWCONF:
+@@ -2091,13 +2117,10 @@ private FsAction getURIAccessType(HiveOperationType
hiveOpType) {
+ case CREATEVIEW:
+ case DROPVIEW:
+ case CREATE_MATERIALIZED_VIEW:
+- case CREATEINDEX:
+- case DROPINDEX:
+- case ALTERINDEX_REBUILD:
+ case ALTERVIEW_PROPERTIES:
+- case DROPVIEW_PROPERTIES:
+ case DROP_MATERIALIZED_VIEW:
+ case ALTER_MATERIALIZED_VIEW_REWRITE:
++ case ALTER_MATERIALIZED_VIEW_REBUILD:
+ case LOCKTABLE:
+ case UNLOCKTABLE:
+ case CREATEROLE:
+@@ -2112,11 +2135,13 @@ private FsAction getURIAccessType(HiveOperationType
hiveOpType) {
+ case SHOW_ROLE_PRINCIPALS:
+ case TRUNCATETABLE:
+ case DESCDATABASE:
++ case DESCDATACONNECTOR:
+ case ALTERVIEW_RENAME:
+ case ALTERVIEW_AS:
+ case SHOW_COMPACTIONS:
+ case SHOW_TRANSACTIONS:
+ case ABORT_TRANSACTIONS:
++ case ABORT_COMPACTION:
+ case SET:
+ case RESET:
+ case DFS:
+diff --git
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
+index 668868350..978fccfe3 100644
+---
a/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
++++
b/hive-agent/src/main/java/org/apache/ranger/authorization/hive/authorizer/RangerHiveAuthorizerBase.java
+@@ -22,7 +22,6 @@
+ import java.util.List;
+
+ import org.apache.hadoop.hive.conf.HiveConf;
+-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+ import org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider;
+ import
org.apache.hadoop.hive.ql.security.authorization.plugin.AbstractHiveAuthorizer;
+ import
org.apache.hadoop.hive.ql.security.authorization.plugin.DisallowTransformHook;
+@@ -100,14 +99,14 @@ public void applyAuthorizationConfigPolicy(HiveConf
hiveConf) throws HiveAuthzPl
+ // from
SQLStdHiveAccessController.applyAuthorizationConfigPolicy()
+ if (mSessionContext != null && mSessionContext.getClientType()
== CLIENT_TYPE.HIVESERVER2) {
+ // Configure PREEXECHOOKS with DisallowTransformHook to
disallow transform queries
+- String hooks =
hiveConf.getVar(ConfVars.PREEXECHOOKS).trim();
++ String hooks =
hiveConf.getVar(HiveConf.getConfVars("hive.exec.pre.hooks")).trim();
+ if (hooks.isEmpty()) {
+ hooks = DisallowTransformHook.class.getName();
+ } else {
+ hooks = hooks + "," +
DisallowTransformHook.class.getName();
+ }
+
+- hiveConf.setVar(ConfVars.PREEXECHOOKS, hooks);
++
hiveConf.setVar(HiveConf.getConfVars("hive.exec.pre.hooks"), hooks);
+
+ SettableConfigUpdater.setHiveConfWhiteList(hiveConf);
+ }
+diff --git
a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
+index 50ab113ed..7025242bc 100644
+---
a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
++++
b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
+@@ -78,7 +78,7 @@ public static void setup() throws Exception {
+
+ // Warehouse
+ File warehouseDir = new
File("./target/hdfs/warehouse").getAbsoluteFile();
+- conf.set(HiveConf.ConfVars.METASTOREWAREHOUSE.varname,
warehouseDir.getPath());
++
conf.set(HiveConf.getConfVars("hive.metastore.warehouse.dir").varname,
warehouseDir.getPath());
+
+ // Scratchdir
+ File scratchDir = new
File("./target/hdfs/scratchdir").getAbsoluteFile();
+@@ -90,7 +90,7 @@ public static void setup() throws Exception {
+
+ // Create a temporary directory for the Hive metastore
+ File metastoreDir = new File("./metastore_db/").getAbsoluteFile();
+- conf.set(HiveConf.ConfVars.METASTORECONNECTURLKEY.varname,
++
conf.set(HiveConf.getConfVars("javax.jdo.option.ConnectionURL").varname,
+ String.format("jdbc:derby:;databaseName=%s;create=true",
metastoreDir.getPath()));
+
+ conf.set(HiveConf.ConfVars.METASTORE_AUTO_CREATE_ALL.varname, "true");
+diff --git
a/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerHiveOperationType.java
b/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerHiveOperationType.java
+index 6b670cb08..71e63bc69 100644
+---
a/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerHiveOperationType.java
++++
b/hive-agent/src/test/java/org/apache/ranger/services/hive/RangerHiveOperationType.java
+@@ -20,6 +20,7 @@
+
+ public enum RangerHiveOperationType {
+ CREATEDATABASE,
++ CREATEDATACONNECTOR,
+ CREATEFUNCTION,
+ CREATETABLE,
+ CREATEVIEW,
+@@ -56,6 +57,12 @@ public enum RangerHiveOperationType {
+ ALTERTABLE_MERGEFILES,
+ ALTERTABLE_PARTCOLTYPE,
+ ALTERTABLE_PROPERTIES,
++ ALTERTABLE_SETPARTSPEC,
++ ALTERTABLE_EXECUTE,
++ ALTERTABLE_CONVERT,
++ ALTERDATACONNECTOR,
++ ALTERDATACONNECTOR_OWNER,
++ ALTERDATACONNECTOR_URL,
+ ALTERTABLE_PROTECTMODE,
+ ALTERTABLE_RENAME,
+ ALTERTABLE_RENAMECOL,
+@@ -69,6 +76,10 @@ public enum RangerHiveOperationType {
+ ALTERTABLE_UPDATEPARTSTATS,
+ ALTERTABLE_UPDATETABLESTATS,
+ ALTERTABLE_UPDATECOLUMNS,
++ ALTERTABLE_CREATEBRANCH,
++ ALTERTABLE_DROPBRANCH,
++ ALTERTABLE_CREATETAG,
++ ALTERTABLE_DROPTAG,
+ ALTERTABLE_EXCHANGEPARTITION,
+ ALTERTABLE_OWNER,
+ ALTERTBLPART_SKEWED_LOCATION,
+@@ -77,11 +88,14 @@ public enum RangerHiveOperationType {
+ ALTERVIEW_RENAME,
+ ALTER_RESOURCEPLAN,
+ ALTER_MATERIALIZED_VIEW_REWRITE,
++ ALTER_MATERIALIZED_VIEW_REBUILD,
+ ALTER_MAPPING,
+ ALTER_TRIGGER,
+ ALTER_POOL,
+ ALTER_SCHEDULED_QUERY,
+ DROPVIEW_PROPERTIES,
++ PREPARE,
++ EXECUTE,
+ MSCK,
+ DROPFUNCTION,
+ DROPINDEX,
+@@ -89,6 +103,7 @@ public enum RangerHiveOperationType {
+ DROPVIEW,
+ DROP_MATERIALIZED_VIEW,
+ DROPDATABASE,
++ DROPDATACONNECTOR,
+ DROP_RESOURCEPLAN,
+ DROP_TRIGGER,
+ DROP_POOL,
+@@ -110,8 +125,10 @@ public enum RangerHiveOperationType {
+ SHOWCOLUMNS,
+ DESCTABLE,
+ SHOWDATABASES,
++ SHOWDATACONNECTORS,
+ SWITCHDATABASE,
+ DESCDATABASE,
++ DESCDATACONNECTOR,
+ SHOWTABLES,
+ TRUNCATETABLE,
+ GRANT_PRIVILEGE,
+@@ -160,6 +177,7 @@ public enum RangerHiveOperationType {
+ SHOW_ROLE_PRINCIPALS,
+ SHOW_TRANSACTIONS,
+ ABORT_TRANSACTIONS,
++ ABORT_COMPACTION,
+ START_TRANSACTION,
+ REPLDUMP,
+ REPLLOAD,
+diff --git a/pom.xml b/pom.xml
+index 344dadbb1..5309caf89 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -107,7 +107,7 @@
+ <hbase-shaded-protobuf>4.1.7</hbase-shaded-protobuf>
+ <hbase.version>2.6.0</hbase.version>
+ <hive.storage-api.version>2.7.2</hive.storage-api.version>
+- <hive.version>3.1.3</hive.version>
++ <hive.version>4.0.1</hive.version>
+ <hppc.version>0.8.0</hppc.version>
+ <htrace-core.version>4.1.0-incubating</htrace-core.version>
+
<httpcomponents.httpasyncclient.version>4.1.4</httpcomponents.httpasyncclient.version>
diff --git a/bigtop-packages/src/common/ranger/patch1-RANGER-4228.diff
b/bigtop-packages/src/common/ranger/patch1-RANGER-4228.diff
deleted file mode 100644
index af563b26e..000000000
--- a/bigtop-packages/src/common/ranger/patch1-RANGER-4228.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From 094027b2f860a0632d135573cfa8656250de1819 Mon Sep 17 00:00:00 2001
-From: jialiang <[email protected]>
-Date: Mon, 8 May 2023 12:54:01 +0800
-Subject: [PATCH] RANGER-4228 fix kafka missing jar ANGER-4201: fix hbase
- can't start
-
----
- distro/src/main/assembly/plugin-kafka.xml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/distro/src/main/assembly/plugin-kafka.xml
b/distro/src/main/assembly/plugin-kafka.xml
-index ed8ef6159..3c39aa4de 100644
---- a/distro/src/main/assembly/plugin-kafka.xml
-+++ b/distro/src/main/assembly/plugin-kafka.xml
-@@ -49,6 +49,8 @@
- <directoryMode>755</directoryMode>
- <fileMode>644</fileMode>
- <includes>
-+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava</include>
-+
<include>org.apache.commons:commons-compress</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>
---
-2.30.1 (Apple Git-130)
-
diff --git a/bigtop-packages/src/common/ranger/patch2-RANGER-3992.diff
b/bigtop-packages/src/common/ranger/patch2-RANGER-3992.diff
deleted file mode 100644
index 1dbcdff01..000000000
--- a/bigtop-packages/src/common/ranger/patch2-RANGER-3992.diff
+++ /dev/null
@@ -1,204 +0,0 @@
-diff --git a/distro/src/main/assembly/admin-web.xml
b/distro/src/main/assembly/admin-web.xml
-index 6a498153d..092379ed0 100644
---- a/distro/src/main/assembly/admin-web.xml
-+++ b/distro/src/main/assembly/admin-web.xml
-@@ -231,6 +231,7 @@
- <include>org.apache.ranger:ranger-plugins-common</include>
- <include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
- <include>org.apache.hadoop:hadoop-common</include>
-+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava</include>
- <include>commons-logging:commons-logging</include>
- <include>com.sun.jersey.contribs:jersey-multipart</include>
- <include>com.google.guava:guava</include>
-@@ -244,8 +245,8 @@
- <include>org.apache.httpcomponents:httpmime</include>
- <include>commons-codec:commons-codec</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
-
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
-@@ -298,10 +299,11 @@
- <include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
- <include>org.apache.commons:commons-lang3</include>
- <include>org.apache.hadoop:hadoop-common</include>
-+ <include>org.apache.hadoop.thirdparty:hadoop-shaded-guava</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.version}</include>
- <include>org.apache.hadoop:hadoop-auth</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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
-
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>
- </includes>
-diff --git a/distro/src/main/assembly/kms.xml
b/distro/src/main/assembly/kms.xml
-index 0387dc6b5..d58234889 100755
---- a/distro/src/main/assembly/kms.xml
-+++ b/distro/src/main/assembly/kms.xml
-@@ -378,6 +378,7 @@
- <include>com.google.guava:guava</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.apache.hadoop:hadoop-common</include>
-+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava</include>
- <include>org.apache.hadoop:hadoop-auth</include>
- <include>org.apache.htrace:htrace-core4</include>
- <include>org.codehaus.woodstox:stax2-api</include>
-diff --git a/distro/src/main/assembly/plugin-atlas.xml
b/distro/src/main/assembly/plugin-atlas.xml
-index d35061274..3d7b5346b 100644
---- a/distro/src/main/assembly/plugin-atlas.xml
-+++ b/distro/src/main/assembly/plugin-atlas.xml
-@@ -68,8 +68,8 @@
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.version}</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
-
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.apache.hadoop:hadoop-azure:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-azure-datalake:jar:${hadoop.version}</include>
-@@ -118,8 +118,8 @@
- <include>org.apache.ranger:ranger-plugins-cred</include>
- <include>org.apache.ranger:credentialbuilder</include>
-
<include>org.apache.htrace:htrace-core4:jar:${htrace-core.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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
-
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
- </includes>
- </binaries>
-diff --git a/distro/src/main/assembly/plugin-ozone.xml
b/distro/src/main/assembly/plugin-ozone.xml
-index 5c0852db7..6a59e241b 100644
---- a/distro/src/main/assembly/plugin-ozone.xml
-+++ b/distro/src/main/assembly/plugin-ozone.xml
-@@ -63,8 +63,8 @@
-
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
-
<include>org.apache.hadoop:hadoop-ozone:jar:${ozone.version}</include>
-
<include>org.apache.hadoop:hadoop-hdds:jar:${ozone.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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
- <include>com.sun.jersey:jersey-core</include>
- <include>com.sun.jersey:jersey-client</include>
- <include>com.sun.jersey:jersey-bundle</include>
-@@ -101,8 +101,8 @@
-
<include>org.apache.zookeeper:zookeeper-jute:jar:${zookeeper.version}</include>
- <include>org.noggit:noggit:jar:${noggit.version}</include>
-
<include>org.apache.solr:solr-solrj:jar:${solr.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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
- <include>com.sun.jersey:jersey-core</include>
- <include>com.sun.jersey:jersey-client</include>
- <include>com.sun.jersey:jersey-bundle</include>
-diff --git a/distro/src/main/assembly/ranger-tools.xml
b/distro/src/main/assembly/ranger-tools.xml
-index b8713d806..f94615033 100644
---- a/distro/src/main/assembly/ranger-tools.xml
-+++ b/distro/src/main/assembly/ranger-tools.xml
-@@ -64,8 +64,8 @@
- <include>org.codehaus.jackson:jackson-jaxrs</include>
- <include>org.codehaus.jackson:jackson-mapper-asl</include>
- <include>org.codehaus.jackson:jackson-xc</include>
--
<include>org.codehaus.woodstox:stax2-api:jar:${codehaus.woodstox.stax2api.version}</include>
--
<include>com.fasterxml.woodstox:woodstox-core:jar:${fasterxml.woodstox.version}</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
-+ <include>com.fasterxml.woodstox:woodstox-core</include>
- <include>org.apache.ranger:ranger-plugins-common</include>
- <include>org.apache.ranger:ranger-plugins-audit</include>
-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
-diff --git a/distro/src/main/assembly/sample-client.xml
b/distro/src/main/assembly/sample-client.xml
-index 241eea629..8aad0df7b 100644
---- a/distro/src/main/assembly/sample-client.xml
-+++ b/distro/src/main/assembly/sample-client.xml
-@@ -66,8 +66,8 @@
-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
- </includes>
- </binaries>
- </moduleSet>
-diff --git a/distro/src/main/assembly/storm-agent.xml
b/distro/src/main/assembly/storm-agent.xml
-index 908415ffa..b8fac8054 100644
---- a/distro/src/main/assembly/storm-agent.xml
-+++ b/distro/src/main/assembly/storm-agent.xml
-@@ -59,6 +59,7 @@
- <includes>
- <include>commons-configuration:commons-configuration</include>
- <include>org.apache.hadoop:hadoop-common</include>
-+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava</include>
- <include>org.apache.hadoop:hadoop-common-plus</include>
- <include>com.google.code.gson:gson</include>
-
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
-diff --git a/distro/src/main/assembly/tagsync.xml
b/distro/src/main/assembly/tagsync.xml
-index 44a8233cc..9b6ae78db 100644
---- a/distro/src/main/assembly/tagsync.xml
-+++ b/distro/src/main/assembly/tagsync.xml
-@@ -52,6 +52,7 @@
-
<include>org.apache.atlas:atlas-common:jar:${atlas.version}</include>
-
<include>org.apache.hadoop:hadoop-auth</include>
-
<include>org.apache.hadoop:hadoop-common</include>
-+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava</include>
-
<include>org.apache.commons:commons-compress</include>
-
<include>org.apache.kafka:kafka-clients:jar:${kafka.version}</include>
-
<include>org.apache.ranger:credentialbuilder</include>
-@@ -87,8 +88,8 @@
-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.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.fasterxml.woodstox:woodstox-core</include>
-+
<include>org.codehaus.woodstox:stax2-api</include>
-
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.cloudera.logredactor:logredactor</include>
-
<include>org.apache.commons:commons-lang3</include>
-diff --git a/distro/src/main/assembly/usersync.xml
b/distro/src/main/assembly/usersync.xml
-index 03667ad4e..eff87ca5d 100644
---- a/distro/src/main/assembly/usersync.xml
-+++ b/distro/src/main/assembly/usersync.xml
-@@ -51,6 +51,7 @@
-
<include>org.apache.hadoop:hadoop-auth</include>
-
<include>org.slf4j:slf4j-api:jar:${slf4j.version}</include>
-
<include>org.apache.hadoop:hadoop-common</include>
-+
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava</include>
-
<include>org.apache.commons:commons-csv</include>
-
<include>org.apache.ranger:credentialbuilder</include>
-
<include>org.apache.ranger:ranger-util</include>
-@@ -63,8 +64,8 @@
-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
-
<include>net.java.dev.jna:jna:jar:${jna.version}</include>
-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.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.fasterxml.woodstox:woodstox-core</include>
-+
<include>org.codehaus.woodstox:stax2-api</include>
-
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
-
<include>org.cloudera.logredactor:logredactor</include>
-
<include>com.fasterxml.jackson.core:jackson-annotations:jar:${fasterxml.jackson.version}</include>
-diff --git a/ranger-examples/distro/src/main/assembly/sample-client.xml
b/ranger-examples/distro/src/main/assembly/sample-client.xml
-index 49aac2142..192b11b98 100644
---- a/ranger-examples/distro/src/main/assembly/sample-client.xml
-+++ b/ranger-examples/distro/src/main/assembly/sample-client.xml
-@@ -62,8 +62,8 @@
-
<include>com.kstruct:gethostname4j:jar:${kstruct.gethostname4j.version}</include>
- <include>net.java.dev.jna:jna:jar:${jna.version}</include>
-
<include>net.java.dev.jna:jna-platform:jar:${jna-platform.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.fasterxml.woodstox:woodstox-core</include>
-+ <include>org.codehaus.woodstox:stax2-api</include>
- </includes>
- </binaries>
- </moduleSet>
diff --git a/bigtop-packages/src/common/ranger/patch4-RANGER-4511.diff
b/bigtop-packages/src/common/ranger/patch4-RANGER-4511.diff
deleted file mode 100644
index 9aa53ccfc..000000000
--- a/bigtop-packages/src/common/ranger/patch4-RANGER-4511.diff
+++ /dev/null
@@ -1,317 +0,0 @@
-diff --git a/distro/pom.xml b/distro/pom.xml
-index f1dff0b72..d8e5c1634 100644
---- a/distro/pom.xml
-+++ b/distro/pom.xml
-@@ -728,10 +728,312 @@
-
- <!--Add a dependency here to ensure this module is the final one built-->
- <dependencies>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-hdfs-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-hdfs-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-hive-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-hive-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-hbase-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-hbase-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-knox-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-knox-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-yarn-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-yarn-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-ozone-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-ozone-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-storm-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-storm-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-kafka-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-kafka-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-solr-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-solr-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-atlas-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-atlas-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-kms-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-kms-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-presto-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-presto-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-schema-registry-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-sqoop-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-sqoop-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-kylin-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-kylin-plugin-shim</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-elasticsearch-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
- <dependency>
- <groupId>org.apache.ranger</groupId>
- <artifactId>ranger-elasticsearch-plugin-shim</artifactId>
- <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-nifi-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-nifi-registry-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-kudu-plugin</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>embeddedwebserver</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>credentialbuilder</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-plugins-installer</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-intg</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-plugins-cred</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-plugins-common</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-plugins-audit</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>jisql</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>security-admin-web</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ <type>war</type>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-plugin-classloader</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-tools</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-tagsync</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>unixusersync</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ugsync-util</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>ranger-util</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>unixauthclient</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.ranger</groupId>
-+ <artifactId>unixauthservice</artifactId>
-+ <version>${project.version}</version>
-+ <scope>provided</scope>
- </dependency>
- </dependencies>
- </project>
diff --git a/bigtop-packages/src/deb/ranger/rules
b/bigtop-packages/src/deb/ranger/rules
index 94d53cd20..a5e07d9cf 100755
--- a/bigtop-packages/src/deb/ranger/rules
+++ b/bigtop-packages/src/deb/ranger/rules
@@ -64,7 +64,6 @@ endef
define ranger_usersync_install
${usr_lib_ranger}-usersync
-${usr_lib_ranger}-usersync/native/credValidator.uexe
${etc_ranger}/usersync
${var_log_ranger}
endef
diff --git a/bigtop-packages/src/rpm/ranger/SPECS/ranger.spec
b/bigtop-packages/src/rpm/ranger/SPECS/ranger.spec
index 19bfa2344..c3113137e 100644
--- a/bigtop-packages/src/rpm/ranger/SPECS/ranger.spec
+++ b/bigtop-packages/src/rpm/ranger/SPECS/ranger.spec
@@ -470,9 +470,6 @@ getent passwd ranger >/dev/null || useradd -c "Ranger" -s
/bin/bash -g ranger -m
%post usersync
%{alternatives_cmd} --install %{np_etc_ranger}/usersync/conf
ranger-usersync-conf %{etc_ranger}/usersync/conf.dist 30
-if [ -f %{usr_lib_ranger}-usersync/native/credValidator.uexe ]; then
- chmod u+s %{usr_lib_ranger}-usersync/native/credValidator.uexe
-fi
%preun usersync
if [ "$1" = 0 ]; then
@@ -521,7 +518,6 @@ fi
%files usersync
%defattr(-,root,root,755)
%{usr_lib_ranger}-usersync
-%attr(750,root,ranger) %{usr_lib_ranger}-usersync/native/credValidator.uexe
%config(noreplace) %{etc_ranger}/usersync/conf.dist
%attr(0755,ranger,ranger) %{np_etc_ranger}/usersync
diff --git a/bigtop.bom b/bigtop.bom
index b76fcd3a0..ef5e93278 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -339,7 +339,7 @@ bigtop {
name = 'ranger'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache Ranger'
- version { base = '2.4.0'; pkg = base; release = 1 }
+ version { base = '2.6.0'; pkg = base; release = 1 }
tarball { destination = "release-$name-${version.base}.tar.gz"
source = destination }
url { site = "https://github.com/apache/ranger/archive/refs/tags";
