From c2da6e7aa2bb0a0e11a0b61ebb411c75d7bea86d Mon Sep 17 00:00:00 2001
From: Matt Gilman <matt.c.gilman@gmail.com>
Date: Wed, 23 Oct 2019 14:35:42 -0400
Subject: [PATCH] NIFI-6687: - Updating exclusions and overrides accordingly
 for Ranger 2.0.

This closes #3835.

Signed-off-by: Bryan Bende <bbende@apache.org>
---
 .../nifi-ranger-plugin/pom.xml                | 11 +-------
 nifi-nar-bundles/nifi-ranger-bundle/pom.xml   | 25 -------------------
 2 files changed, 1 insertion(+), 35 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
index 35775cc270..45871c5ba5 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>
-        <ranger.hadoop.version>3.0.0</ranger.hadoop.version>
+        <ranger.hadoop.version>3.1.1</ranger.hadoop.version>
     </properties>
     <dependencies>
         <dependency>
@@ -36,11 +36,6 @@
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-bundle</artifactId>
-            <version>1.19</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.ranger</groupId>
             <artifactId>ranger-plugins-common</artifactId>
@@ -54,10 +49,6 @@
                     <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jersey</groupId>
-                    <artifactId>jersey-bundle</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
index c2180a9b12..6ae02e7a61 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
@@ -27,35 +27,10 @@
     <version>1.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <properties>
-        <httpcomponents.httpclient.version>4.4.1</httpcomponents.httpclient.version>
-        <httpcomponents.httpcore.version>4.4.1</httpcomponents.httpcore.version>
-        <httpcomponents.httpmime.version>4.4.1</httpcomponents.httpmime.version>
-    </properties>
-
     <modules>
         <module>nifi-ranger-plugin</module>
         <module>nifi-ranger-nar</module>
 	    <module>nifi-ranger-resources</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${httpcomponents.httpclient.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>${httpcomponents.httpcore.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpmime</artifactId>
-                <version>${httpcomponents.httpmime.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>