You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ym...@apache.org on 2018/06/30 03:40:27 UTC

nifi git commit: NIFI-5354 Changing ranger.version to 1.0.0 and ranger.hadoop.version to 3.0.0

Repository: nifi
Updated Branches:
  refs/heads/master a14dbc7db -> 3fd45ac4c


NIFI-5354 Changing ranger.version to 1.0.0 and ranger.hadoop.version to 3.0.0

Signed-off-by: Yolanda Davis <ym...@apache.org>

This closes #2827


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3fd45ac4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3fd45ac4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3fd45ac4

Branch: refs/heads/master
Commit: 3fd45ac4c4155311966f675c6a504d683796b172
Parents: a14dbc7
Author: Bryan Bende <bb...@apache.org>
Authored: Fri Jun 29 10:33:10 2018 -0400
Committer: Yolanda Davis <ym...@apache.org>
Committed: Fri Jun 29 23:36:54 2018 -0400

----------------------------------------------------------------------
 .../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml  | 17 +++++++++++++++--
 pom.xml                                            |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/3fd45ac4/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
index 05ba7ed..384997e 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>nifi-ranger-plugin</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <hadoop.version>2.7.3</hadoop.version>
+        <ranger.hadoop.version>3.0.0</ranger.hadoop.version>
     </properties>
     <dependencies>
         <dependency>
@@ -91,10 +91,23 @@
             <artifactId>findbugs-annotations</artifactId>
             <version>1.3.9-1</version>
         </dependency>
+        <!-- hadoop-client is needed for auditing to HDFS -->
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
-            <version>${hadoop.version}</version>
+            <version>${ranger.hadoop.version}</version>
+        </dependency>
+        <!-- hadoop-common and hadoop-auth are transitive dependencies of ranger client, but we need to make sure they
+                are the same version as hadoop-client above -->
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${ranger.hadoop.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-auth</artifactId>
+            <version>${ranger.hadoop.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>

http://git-wip-us.apache.org/repos/asf/nifi/blob/3fd45ac4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 74431cd..b1f5250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <inceptionYear>2014</inceptionYear>
         <org.slf4j.version>1.7.25</org.slf4j.version>
-        <ranger.version>0.7.1</ranger.version>
+        <ranger.version>1.0.0</ranger.version>
         <jetty.version>9.4.3.v20170317</jetty.version>
     </properties>