NIFI-3018 removed flume-twitter-source due to usage of org.json cat-x lib Signed-off-by: Joe Skora <jsk...@apache.org>
This closes #1666 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/50725591 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/50725591 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/50725591 Branch: refs/heads/support/nifi-0.7.x Commit: 5072559156c613823ac554884dd9166acb0edd6b Parents: a1bb7a7 Author: Mike Moser <mose...@apache.org> Authored: Wed Apr 12 15:35:19 2017 +0000 Committer: Joe Skora <jsk...@apache.org> Committed: Thu Apr 27 12:56:44 2017 -0400 ---------------------------------------------------------------------- .../nifi-flume-nar/src/main/resources/META-INF/NOTICE | 6 ------ .../nifi-flume-bundle/nifi-flume-processors/pom.xml | 5 ----- 2 files changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/50725591/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- 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 7d73ff9..a154d24 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/50725591/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml ---------------------------------------------------------------------- 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 0293605..994e396 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 @@ <artifactId>flume-scribe-source</artifactId> <version>${flume.version}</version> </dependency> - <dependency> - <groupId>org.apache.flume.flume-ng-sources</groupId> - <artifactId>flume-twitter-source</artifactId> - <version>${flume.version}</version> - </dependency> <!-- Flume Sinks --> <dependency>