From b4669322abe9a9a13d951b7158577ac4fb874027 Mon Sep 17 00:00:00 2001
From: Joey Frazee <jfrazee@apache.org>
Date: Tue, 11 Apr 2017 10:19:44 -0500
Subject: [PATCH] NIFI-3019 cherry-picked into 0.x branch by mosermw@apache.org
 NIFI-3692 Use hbc-core instead of hbc-twitter4j in social-media bundle to
 resolve org.json cat-x

---
 nifi-assembly/NOTICE                                 |  6 ------
 .../src/main/resources/META-INF/NOTICE               |  8 +-------
 .../nifi-twitter-processors/pom.xml                  | 12 +++++++++++-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index ebada228a19a..1a5dc0b6bcd2 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -642,12 +642,6 @@ The following binary components are provided under the Apache Software License v
       Apache License Version 2.0 http://www.apache.org/licenses/.
       (c) Daniel Lemire, http://lemire.me/en/
 
-  (ASLv2) Twitter4J
-    The following NOTICE information applies:
-      Copyright 2007 Yusuke Yamamoto
-      
-      Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
-  
   (ASLv2) JOAuth
     The following NOTICE information applies:
       JOAuth
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
index 7a356868d585..23e8f90385d5 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
@@ -40,12 +40,6 @@ The following binary components are provided under the Apache Software License v
       Apache Commons Logging
       Copyright 2003-2013 The Apache Software Foundation
 
-  (ASLv2) Twitter4J
-    The following NOTICE information applies:
-      Copyright 2007 Yusuke Yamamoto
-      
-      Twitter4J includes software from JSON.org to parse JSON response from the Twitter API. You can see the license term at http://www.JSON.org/license.html
-  
   (ASLv2) JOAuth
     The following NOTICE information applies:
       JOAuth
@@ -54,4 +48,4 @@ The following binary components are provided under the Apache Software License v
   (ASLv2) Hosebird Client
     The following NOTICE information applies:
       Hosebird Client (hbc)
-      Copyright 2013 Twitter, Inc.
\ No newline at end of file
+      Copyright 2013 Twitter, Inc.
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index aefe6fa32386..3f34ef5a2f20 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -36,8 +36,18 @@
         </dependency>
         <dependency>
             <groupId>com.twitter</groupId>
-            <artifactId>hbc-twitter4j</artifactId>
+            <artifactId>hbc-core</artifactId>
             <version>2.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.twitter4j</groupId>
+                    <artifactId>twitter4j-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>