From 9cf47f52c91eddb8ea513defd5a4a76e75ced099 Mon Sep 17 00:00:00 2001 From: Mike Moser Date: Wed, 12 Apr 2017 15:35:19 +0000 Subject: [PATCH] NIFI-3018 removed flume-twitter-source due to usage of org.json cat-x lib --- .../nifi-flume-nar/src/main/resources/META-INF/NOTICE | 6 ------ .../nifi-flume-bundle/nifi-flume-processors/pom.xml | 5 ----- 2 files changed, 11 deletions(-) diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE index 7d73ff98e0f6..a154d24c4a0d 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE @@ -175,12 +175,6 @@ The following binary components are provided under the Apache Software License v Jetty Web Container Copyright 1995-2015 Mort Bay Consulting Pty Ltd. - (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) Apache Velocity The following NOTICE information applies: Apache Velocity diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml index 0293605a0710..994e3962646a 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml @@ -78,11 +78,6 @@ flume-scribe-source ${flume.version} - - org.apache.flume.flume-ng-sources - flume-twitter-source - ${flume.version} -