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 F39D5200CAC for ; Thu, 11 May 2017 19:33:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F280D160BCE; Thu, 11 May 2017 17:33:07 +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 263E1160BCD for ; Thu, 11 May 2017 19:33:06 +0200 (CEST) Received: (qmail 47728 invoked by uid 500); 11 May 2017 17:33:04 -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 47552 invoked by uid 99); 11 May 2017 17:33:04 -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; Thu, 11 May 2017 17:33:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C74DE943C; Thu, 11 May 2017 17:33:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mosermw@apache.org To: commits@nifi.apache.org Date: Thu, 11 May 2017 17:33:33 -0000 Message-Id: <6d4d9274c73449fc81864e1215a5b8c6@git.apache.org> In-Reply-To: <84cfe7e70b87483bae9d83440c3aadc8@git.apache.org> References: <84cfe7e70b87483bae9d83440c3aadc8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/39] nifi git commit: NIFI-3018 removed flume-twitter-source due to usage of org.json cat-x lib archived-at: Thu, 11 May 2017 17:33:08 -0000 NIFI-3018 removed flume-twitter-source due to usage of org.json cat-x lib Signed-off-by: Joe Skora 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 Authored: Wed Apr 12 15:35:19 2017 +0000 Committer: Joe Skora 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 @@ flume-scribe-source ${flume.version} - - org.apache.flume.flume-ng-sources - flume-twitter-source - ${flume.version} -