NIFI-3019 cherry-picked into 0.x branch by mose...@apache.org NIFI-3692 Use hbc-core instead of hbc-twitter4j in social-media bundle to resolve org.json cat-x
Signed-off-by: Joe Skora <jsk...@apache.org> This closes #1667. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/cd1cf68c Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/cd1cf68c Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/cd1cf68c Branch: refs/heads/support/nifi-0.7.x Commit: cd1cf68c9841d0cc892187ce0e510492cd9ddd48 Parents: 5072559 Author: Joey Frazee <jfra...@apache.org> Authored: Tue Apr 11 10:19:44 2017 -0500 Committer: Joe Skora <jsk...@apache.org> Committed: Thu Apr 27 13:17:09 2017 -0400 ---------------------------------------------------------------------- nifi-assembly/NOTICE | 6 ------ .../src/main/resources/META-INF/NOTICE | 8 +------- .../nifi-twitter-processors/pom.xml | 12 +++++++++++- 3 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/cd1cf68c/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 6afaf78..75aebf2 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/cd1cf68c/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- 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 7a35686..23e8f90 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. http://git-wip-us.apache.org/repos/asf/nifi/blob/cd1cf68c/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml ---------------------------------------------------------------------- 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 aefe6fa..3f34ef5 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>