You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/07/14 23:17:31 UTC
[13/13] incubator-nifi git commit: NIFI-589: - Tweaking license files.
NIFI-589:
- Tweaking license files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6f3039c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6f3039c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6f3039c8
Branch: refs/heads/develop
Commit: 6f3039c8c38d6af399f5a896fb7879db111ab4fe
Parents: 2a3deed
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Jul 14 17:11:08 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Jul 14 17:11:08 2015 -0400
----------------------------------------------------------------------
nifi/nifi-assembly/NOTICE | 63 ++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 53 +++++++++++++++-
2 files changed, 113 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6f3039c8/nifi/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/NOTICE b/nifi/nifi-assembly/NOTICE
index 23c07b7..f71f98c 100644
--- a/nifi/nifi-assembly/NOTICE
+++ b/nifi/nifi-assembly/NOTICE
@@ -108,6 +108,69 @@ The following binary components are provided under the Apache Software License v
Spring Framework 4.1.4.RELEASE
Copyright (c) 2002-2015 Pivotal, Inc.
+ (ASLv2) Apache Flume
+ The following NOTICE information applies:
+ Apache Flume
+ Copyright 2011-2015 Apache Software Foundation
+
+ asynchbase is BSD-licensed software (https://github.com/OpenTSDB/asynchbase)
+
+ async is BSD-licensed software (https://github.com/stumbleupon/async)
+
+ jopt-simple is MIT licensed software (http://pholser.github.io/jopt-simple/license.html)
+
+ scala-library is BSD-like licensed software (http://www.scala-lang.org/license.html)
+
+ (ASLv2) Xalan
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software was originally based on the following:
+
+ - software copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
+ - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
+ - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
+ - voluntary contributions made by Ovidiu Predescu (ovidiu@cup.hp.com) on behalf of the
+ Apache Software Foundation and was originally developed at Hewlett Packard Company.
+
+ (ASLv2) Apache XML Commons XML APIs
+ Copyright 2006 The Apache Software Foundation.
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+
+ (ASLv2) IRClib
+ The following NOTICE information applies:
+ IRClib -- A Java Internet Relay Chat library --
+ Copyright (C) 2002 - 2006 Christoph Schwering <sc...@gmail.com>
+
+ (ASLv2) Apache Thrift
+ The following NOTICE information applies:
+ Apache Thrift
+ Copyright 2006-2010 The Apache Software Foundation.
+
+ (ASLv2) Apache MINA
+ The following NOTICE information applies:
+ Apache MINA Core
+ Copyright 2004-2011 Apache MINA Project
+
+ (ASLv2) opencsv (net.sf.opencsv:opencsv:2.3)
+
+ (ASLv2) Apache Velocity
+ The following NOTICE information applies:
+ Apache Velocity
+ Copyright (C) 2000-2007 The Apache Software Foundation
+
+ (ASLv2) ZkClient
+ The following NOTICE information applies:
+ ZkClient
+ Copyright 2009 Stefan Groschupf
+
(ASLv2) Apache Commons CLI
The following NOTICE information applies:
Apache Commons CLI
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6f3039c8/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
index 793746f..b651143 100644
--- a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-nifi-social-media-nar
+nifi-flume-nar
Copyright 2015 The Apache Software Foundation
This product includes software developed at
@@ -33,6 +33,50 @@ The following binary components are provided under the Apache Software License v
Apache Flume
Copyright 2011-2015 Apache Software Foundation
+ asynchbase is BSD-licensed software (https://github.com/OpenTSDB/asynchbase)
+
+ async is BSD-licensed software (https://github.com/stumbleupon/async)
+
+ jopt-simple is MIT licensed software (http://pholser.github.io/jopt-simple/license.html)
+
+ scala-library is BSD-like licensed software (http://www.scala-lang.org/license.html)
+
+ (ASLv2) Xalan
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software was originally based on the following:
+
+ - software copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
+ - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
+ - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
+ - voluntary contributions made by Ovidiu Predescu (ovidiu@cup.hp.com) on behalf of the
+ Apache Software Foundation and was originally developed at Hewlett Packard Company.
+
+ (ASLv2) Apache Xerces Java
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
+
+ (ASLv2) Apache XML Commons XML APIs
+ Copyright 2006 The Apache Software Foundation.
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+
(ASLv2) IRClib
The following NOTICE information applies:
IRClib -- A Java Internet Relay Chat library --
@@ -126,7 +170,10 @@ 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) Servlet Specification API (org.mortbay.jetty:servlet-api:2.5-20110124)
+ (ASLv2) Jetty
+ The following NOTICE information applies:
+ Jetty Web Container
+ Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
(ASLv2) Twitter4J
The following NOTICE information applies:
@@ -142,4 +189,4 @@ The following binary components are provided under the Apache Software License v
(ASLv2) ZkClient
The following NOTICE information applies:
ZkClient
- Copyright 2009 Stefan Groschupf
\ No newline at end of file
+ Copyright 2009 Stefan Groschupf