Repository: nifi Updated Branches: refs/heads/master d6422e2d2 -> c752ec839
NIFI-5705: Added Hive 3 attribution to nifi-assembly and top-level NOTICEs This closes #3076 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c752ec83 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c752ec83 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c752ec83 Branch: refs/heads/master Commit: c752ec8394ed8906009759161fb8da08ea32251c Parents: d6422e2 Author: Matthew Burgess <[email protected]> Authored: Mon Oct 15 19:34:05 2018 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed Oct 17 12:24:32 2018 -0400 ---------------------------------------------------------------------- NOTICE | 3 +++ nifi-assembly/NOTICE | 3 +++ .../nifi-hive3-nar/src/main/resources/META-INF/NOTICE | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/c752ec83/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index f5f1a7f..7cc5b48 100644 --- a/NOTICE +++ b/NOTICE @@ -31,6 +31,9 @@ This includes derived works from the Apache Hive (ASLv2 licensed) project (https The derived work is adapted from release-1.2.1/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java and can be found in the org.apache.hadoop.hive.ql.io.orc package + The derived work is adapted from + release-3.0.0/serde/src/java/org/apache/hadoop/hive/serde2/JsonSerDe.java + and can be found in the org.apache.hive.streaming.NiFiRecordSerDe class This includes derived works from the Apache Software License V2 library Jolt (https://github.com/bazaarvoice/jolt) Copyright 2013-2014 Bazaarvoice, Inc http://git-wip-us.apache.org/repos/asf/nifi/blob/c752ec83/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index d283699..81b9d9b 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -31,6 +31,9 @@ This includes derived works from the Apache Hive (ASLv2 licensed) project (https The derived work is adapted from release-1.2.1/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java and can be found in the org.apache.hadoop.hive.ql.io.orc package + The derived work is adapted from + release-3.0.0/serde/src/java/org/apache/hadoop/hive/serde2/JsonSerDe.java + and can be found in the org.apache.hive.streaming.NiFiRecordSerDe class This includes derived works from the Apache Software License V2 library Jolt (https://github.com/bazaarvoice/jolt) Copyright 2013-2014 Bazaarvoice, Inc http://git-wip-us.apache.org/repos/asf/nifi/blob/c752ec83/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE index 9da3e38..dacc757 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE @@ -20,7 +20,7 @@ This includes derived works from the Apache Hive (ASLv2 licensed) project (https branch-3.0/streaming/src/java/org/apache/hive/streaming/StrictJsonWriter.java and can be found in the org.apache.hive.streaming.HiveRecordWriter class The derived work is adapted from - branch-3.0/serde/src/java/org/apache/hadoop/hive/serde2/JsonSerDe.java + release-3.0.0/serde/src/java/org/apache/hadoop/hive/serde2/JsonSerDe.java and can be found in the org.apache.hive.streaming.NiFiRecordSerDe class ===========================================
