Repository: nifi Updated Branches: refs/heads/master 42df02f01 -> 7575e87cb
NIFI-2520 This closes #818. Added attribution for storm-hive and other Hive dependencies to NOTICEs Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7575e87c Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7575e87c Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7575e87c Branch: refs/heads/master Commit: 7575e87cb14074bd2156addefb4140d51c4eb178 Parents: 42df02f Author: Matt Burgess <mattyb...@apache.org> Authored: Tue Aug 9 14:47:23 2016 -0400 Committer: joewitt <joew...@apache.org> Committed: Tue Aug 9 15:27:24 2016 -0400 ---------------------------------------------------------------------- NOTICE | 9 ++- nifi-assembly/NOTICE | 58 ++++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 19 +++---- 3 files changed, 73 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/7575e87c/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 9661690..e59acd4 100644 --- a/NOTICE +++ b/NOTICE @@ -11,4 +11,11 @@ BoundedByteArrayOutputStream.java adapted to SoftLimitBoundedByteArrayOutputStre This includes derived works from the Apache Software License V2 library python-evtx (https://github.com/williballenthin/python-evtx) Copyright 2012, 2013 Willi Ballenthin william.ballent...@mandiant.com while at Mandiant http://www.mandiant.com -The derived work is adapted from Evtx/Evtx.py, Evtx/BinaryParser.py, Evtx/Nodes.py, Evtx/Views.py and can be found in the org.apache.nifi.processors.evtx.parser package. \ No newline at end of file +The derived work is adapted from Evtx/Evtx.py, Evtx/BinaryParser.py, Evtx/Nodes.py, Evtx/Views.py and can be found in the org.apache.nifi.processors.evtx.parser package. + +This includes derived works from the Apache Storm (ASLv2 licensed) project (https://github.com/apache/storm): +Copyright 2015 The Apache Software Foundation +The derived work is adapted from + org/apache/storm/hive/common/HiveWriter.java + org/apache/storm/hive/common/HiveOptions.java +and can be found in the org.apache.nifi.util.hive package http://git-wip-us.apache.org/repos/asf/nifi/blob/7575e87c/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index ad3a6d7..5bb181e 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -859,11 +859,69 @@ The following binary components are provided under the Apache Software License v Apache Commons Email Copyright 2002-2015 The Apache Software Foundation + (ASLv2) Apache Hive + The following NOTICE information applies: + Apache Hive + Copyright 2008-2015 The Apache Software Foundation + + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). + + This product includes Jersey (https://jersey.java.net/) + Copyright (c) 2010-2014 Oracle and/or its affiliates. + + This project includes software copyrighted by Microsoft Corporation and + licensed under the Apache License, Version 2.0. + + This project includes software copyrighted by Dell SecureWorks and + licensed under the Apache License, Version 2.0. + + (ASLv2) BoneCP + The following NOTICE information applies: + BoneCP + Copyright 2010 Wallace Wadge + + (ASLv2) Apache Hadoop + The following NOTICE information applies: + The binary distribution of this product bundles binaries of + org.iq80.leveldb:leveldb-api (https://github.com/dain/leveldb), which has the + following notices: + * Copyright 2011 Dain Sundstrom <d...@iq80.com> + * Copyright 2011 FuseSource Corp. http://fusesource.com + + The binary distribution of this product bundles binaries of + org.fusesource.hawtjni:hawtjni-runtime (https://github.com/fusesource/hawtjni), + which has the following notices: + * This product includes software developed by FuseSource Corp. + http://fusesource.com + * This product includes software developed at + Progress Software Corporation and/or its subsidiaries or affiliates. + * This product includes software developed by IBM Corporation and others. + + (ASLv2) Dropwizard Metrics + The following NOTICE information applies: + Metrics + Copyright 2010-2013 Coda Hale and Yammer, Inc. + + This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64, + LongAdder), which was released with the following comments: + + Written by Doug Lea with assistance from members of JCP JSR-166 + Expert Group and released to the public domain, as explained at + http://creativecommons.org/publicdomain/zero/1.0/ + This includes derived works from the Apache Software License V2 library python-evtx (https://github.com/williballenthin/python-evtx) Copyright 2012, 2013 Willi Ballenthin william.ballent...@mandiant.com while at Mandiant http://www.mandiant.com The derived work is adapted from Evtx/Evtx.py, Evtx/BinaryParser.py, Evtx/Nodes.py, Evtx/Views.py and can be found in the org.apache.nifi.processors.evtx.parser package. +This includes derived works from the Apache Storm (ASLv2 licensed) project (https://github.com/apache/storm): +Copyright 2015 The Apache Software Foundation +The derived work is adapted from + org/apache/storm/hive/common/HiveWriter.java + org/apache/storm/hive/common/HiveOptions.java +and can be found in the org.apache.nifi.util.hive package + + ************************ Common Development and Distribution License 1.1 ************************ http://git-wip-us.apache.org/repos/asf/nifi/blob/7575e87c/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE index 34209f4..fa20405 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE @@ -4,6 +4,13 @@ Copyright 2014-2016 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +This includes derived works from the Apache Storm (ASLv2 licensed) project (https://github.com/apache/storm): +Copyright 2015 The Apache Software Foundation +The derived work is adapted from + org/apache/storm/hive/common/HiveWriter.java + org/apache/storm/hive/common/HiveOptions.java +and can be found in the org.apache.nifi.util.hive package + =========================================== Apache Software License v2 =========================================== @@ -84,18 +91,6 @@ The following binary components are provided under the Apache Software License v This project includes software copyrighted by Dell SecureWorks and licensed under the Apache License, Version 2.0. - (ASLv2) Apache ORC - The following NOTICE information applies: - Apache ORC - Copyright 2013-2015 The Apache Software Foundation - - This product includes software developed by The Apache Software - Foundation (http://www.apache.org/). - - This product includes software developed by Hewlett-Packard: - (c) Copyright [2014-2015] Hewlett-Packard Development Company, L.P - - (ASLv2) Jackson JSON processor The following NOTICE information applies: # Jackson JSON processor
