Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D6D34200C53 for ; Tue, 11 Apr 2017 21:08:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D5797160B9B; Tue, 11 Apr 2017 19:08:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 007F7160B7D for ; Tue, 11 Apr 2017 21:08:13 +0200 (CEST) Received: (qmail 21243 invoked by uid 500); 11 Apr 2017 19:08:13 -0000 Mailing-List: contact commits-help@nifi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.apache.org Delivered-To: mailing list commits@nifi.apache.org Received: (qmail 21234 invoked by uid 99); 11 Apr 2017 19:08:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Apr 2017 19:08:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1AA57DF9FD; Tue, 11 Apr 2017 19:08:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joewitt@apache.org To: commits@nifi.apache.org Message-Id: <7672bec37a924c9b8162a509b7fda2c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: nifi git commit: NIFI-3692 This closes #1663. Use hbc-core instead of hbc-twitter4j in social-media bundle to resolve org.json cat-x Date: Tue, 11 Apr 2017 19:08:13 +0000 (UTC) archived-at: Tue, 11 Apr 2017 19:08:15 -0000 Repository: nifi Updated Branches: refs/heads/master 7c19796eb -> 4a8398bb3 NIFI-3692 This closes #1663. Use hbc-core instead of hbc-twitter4j in social-media bundle to resolve org.json cat-x Signed-off-by: joewitt Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4a8398bb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4a8398bb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4a8398bb Branch: refs/heads/master Commit: 4a8398bb31173f4a00bb52bbf227af0c5b49876d Parents: 7c19796 Author: Joey Frazee Authored: Tue Apr 11 10:19:44 2017 -0500 Committer: joewitt Committed: Tue Apr 11 14:25:04 2017 -0400 ---------------------------------------------------------------------- nifi-assembly/NOTICE | 28 ------------------ .../src/main/resources/META-INF/NOTICE | 30 +------------------- .../nifi-twitter-processors/pom.xml | 6 +++- 3 files changed, 6 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/4a8398bb/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 5b4c449..758f294 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -132,34 +132,6 @@ The following binary components are provided under the Apache Software License v Apache Commons Logging Copyright 2003-2014 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 - - Copyright (c) 2002 JSON.org - - Permission is hereby granted, free of charge, to any person obtaining a copy of this - software and associated documentation files (the "Software"), to deal in the Software - without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - The Software shall be used for Good, not Evil. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - (ASLv2) Apache Commons VFS The following NOTICE information applies: Apache Commons VFS http://git-wip-us.apache.org/repos/asf/nifi/blob/4a8398bb/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 dfcff13..be0cbe2 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,39 +40,11 @@ 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 - - Copyright (c) 2002 JSON.org - - Permission is hereby granted, free of charge, to any person obtaining a copy of this - software and associated documentation files (the "Software"), to deal in the Software - without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - The Software shall be used for Good, not Evil. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - (ASLv2) JOAuth The following NOTICE information applies: JOAuth Copyright 2010-2013 Twitter, Inc - + (ASLv2) Hosebird Client The following NOTICE information applies: Hosebird Client (hbc) http://git-wip-us.apache.org/repos/asf/nifi/blob/4a8398bb/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 6cbdd73..b0ddb80 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,13 +36,17 @@ com.twitter - hbc-twitter4j + hbc-core 2.2.0 com.google.code.findbugs jsr305 + + org.twitter4j + twitter4j-core +