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

…to 3.0.0 Signed-off-by: Yolanda Davis <[email protected]> This closes apache#2827
brandonJY · Jun 30, 2018 · 3fd45ac · 3fd45ac
1 parent a14dbc7
commit 3fd45ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
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
@@ -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>

diff --git 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>