You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2017/05/05 22:44:26 UTC
nifi git commit: NIFI-3825 fix L&N for jolt, json, and source deps
Repository: nifi
Updated Branches:
refs/heads/master d069bf9c3 -> 829c02b05
NIFI-3825 fix L&N for jolt, json, and source deps
Signed-off-by: Scott Aslan <sc...@gmail.com>
This closes #1765
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/829c02b0
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/829c02b0
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/829c02b0
Branch: refs/heads/master
Commit: 829c02b058199bff167b4e78934584cabc92de78
Parents: d069bf9
Author: joewitt <jo...@apache.org>
Authored: Fri May 5 18:16:00 2017 -0400
Committer: Scott Aslan <sc...@gmail.com>
Committed: Fri May 5 18:43:04 2017 -0400
----------------------------------------------------------------------
NOTICE | 46 ++++++++++-------
nifi-assembly/NOTICE | 54 +++++++++++++-------
.../src/main/resources/META-INF/NOTICE | 11 ++--
.../src/main/resources/META-INF/NOTICE | 4 ++
.../src/main/resources/META-INF/NOTICE | 18 +++----
.../src/main/resources/META-INF/LICENSE | 16 ------
.../src/main/resources/META-INF/LICENSE | 16 ------
.../src/main/resources/META-INF/NOTICE | 17 +++---
nifi-toolkit/nifi-toolkit-assembly/NOTICE | 7 ---
9 files changed, 90 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index ee87f2b..b681274 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,26 +4,36 @@ Copyright 2014-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes the following work from the Apache Hadoop project:
-
-BoundedByteArrayOutputStream.java adapted to SoftLimitBoundedByteArrayOutputStream.java
-
-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.ballenthin@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 product includes the following work from the Apache Hadoop project under Apache Software License V2:
+ BoundedByteArrayOutputStream.java adapted to SoftLimitBoundedByteArrayOutputStream.java
+This product includes derived works from the Apache Software License V2 library python-evtx (https://github.com/williballenthin/python-evtx)
+ Copyright 2012, 2013 Willi Ballenthin william.ballenthin@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
+ 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
This includes derived works from the Apache Hive (ASLv2 licensed) project (https://github.com/apache/hive):
-Copyright 2008-2016 The Apache Software Foundation
-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
+ Copyright 2008-2016 The Apache Software Foundation
+ 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
+
+This includes derived works from the Apache Software License V2 library Jolt (https://github.com/bazaarvoice/jolt)
+ Copyright 2013-2014 Bazaarvoice, Inc
+ The derived work is adapted from com.bazaarvoice.jolt.chainr.ChainrBuilder.java, com.bazaarvoice.jolt.chainr.spec.ChainrSpec.java,
+ com.bazaarvoice.jolt.chainr.spec.ChainrEntry.java and can be found in the org.apache.nifi.processors.standard.util.jolt.TransformFactory.java class.
+
+This includes derived works from Elastic Logstash (https://github.com/elastic/logstash/tree/v1.4.0/) and modified by Anthony Corbacho, and contributors
+ available under an Apache Software License V2.
+ Copyright 2009-2013 Jordan Sissel, Pete Fritchman, and contributors.
+ Copyright 2014 Anthony Corbacho, and contributors.
+ The derived work consists in modifications from patterns/grok-patterns
+ and can be found in the file nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestExtractGrok/patterns
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 3573811..bd7ccc2 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -4,9 +4,39 @@ Copyright 2014-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes the following work from the Apache Hadoop project:
+This product includes the following work from the Apache Hadoop project under Apache Software License V2:
+ BoundedByteArrayOutputStream.java adapted to SoftLimitBoundedByteArrayOutputStream.java
-BoundedByteArrayOutputStream.java which was adapted to SoftLimitBoundedByteArrayOutputStream.java
+This product includes derived works from the Apache Software License V2 library python-evtx (https://github.com/williballenthin/python-evtx)
+ Copyright 2012, 2013 Willi Ballenthin william.ballenthin@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
+
+This includes derived works from the Apache Hive (ASLv2 licensed) project (https://github.com/apache/hive):
+ Copyright 2008-2016 The Apache Software Foundation
+ 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
+
+This includes derived works from the Apache Software License V2 library Jolt (https://github.com/bazaarvoice/jolt)
+ Copyright 2013-2014 Bazaarvoice, Inc
+ The derived work is adapted from com.bazaarvoice.jolt.chainr.ChainrBuilder.java, com.bazaarvoice.jolt.chainr.spec.ChainrSpec.java,
+ com.bazaarvoice.jolt.chainr.spec.ChainrEntry.java and can be found in the org.apache.nifi.processors.standard.util.jolt.TransformFactory.java class.
+
+This includes derived works from Elastic Logstash (https://github.com/elastic/logstash/tree/v1.4.0/) and modified by Anthony Corbacho, and contributors
+ available under an Apache Software License V2.
+ Copyright 2009-2013 Jordan Sissel, Pete Fritchman, and contributors.
+ Copyright 2014 Anthony Corbacho, and contributors.
+ The derived work consists in modifications from patterns/grok-patterns
+ and can be found in the file nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestExtractGrok/patterns
===========================================
Apache Software License v2
@@ -1203,23 +1233,9 @@ The following binary components are provided under the Apache Software License v
* HOMEPAGE:
* http://felix.apache.org/
-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.ballenthin@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
-
-This includes derived works from the Apache Hive (ASLv2 licensed) project (https://github.com/apache/hive):
-Copyright 2008-2016 The Apache Software Foundation
-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
+ (ASLv2) Android JSON library
+ The following NOTICE information applies:
+ Copyright (C) 2010 The Android Open Source Project
(ASLv2) tlsh
The following NOTICE information applies:
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE
index a1c9e25..1a24dc3 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE
@@ -1,14 +1,15 @@
nifi-evtx-nar
Copyright 2016 The Apache Software Foundation
-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.ballenthin@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 product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This product includes derived works from the Apache Software License V2 library python-evtx (https://github.com/williballenthin/python-evtx)
+ Copyright 2012, 2013 Willi Ballenthin william.ballenthin@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.
+
******************
Apache Software License v2
******************
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE
index 1fdb5c4..a0bcbbf 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE
@@ -123,6 +123,10 @@ The following binary components are provided under the Apache Software License v
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.
+ (ASLv2) Android JSON library
+ The following NOTICE information applies:
+ Copyright (C) 2010 The Android Open Source Project
+
************************
Common Development and Distribution License 1.1
************************
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/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 6731e64..83b97e7 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
@@ -5,17 +5,17 @@ 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
+ 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
This includes derived works from the Apache Hive (ASLv2 licensed) project (https://github.com/apache/hive):
-Copyright 2008-2016 The Apache Software Foundation
-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
+ Copyright 2008-2016 The Apache Software Foundation
+ 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
===========================================
Apache Software License v2
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/resources/META-INF/LICENSE
index 648041d..7a5bf90 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/resources/META-INF/LICENSE
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/resources/META-INF/LICENSE
@@ -237,22 +237,6 @@ licenses.
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
-This product bundles 'Jolt' which is available under an Apache License. For details see https://github.com/bazaarvoice/jolt/blob/jolt-0.0.20/LICENSE
-
- Copyright 2013-2014 Bazaarvoice, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
This product bundles 'AngularUI Codemirror' which is available under an MIT license.
Copyright (c) 2012 the AngularUI Team, http://angular-ui.github.com
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE
index 327aa71..a8db80f 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/LICENSE
@@ -337,22 +337,6 @@ The binary distribution of this product bundles 'jBCrypt' which is available und
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-This product bundles 'Jolt' which is available under an Apache License. For details see https://github.com/bazaarvoice/jolt/blob/jolt-0.0.20/LICENSE
-
- Copyright 2013-2014 Bazaarvoice, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
This product bundles 'AngularUI Codemirror' which is available under an MIT license.
Copyright (c) 2012 the AngularUI Team, http://angular-ui.github.com
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
index 6557c7b..6a88d5f 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
@@ -1,18 +1,17 @@
nifi-standard-nar
Copyright 2014-2017 The Apache Software Foundation
-This includes derived works from the Apache Software License V2 library Jolt (https://github.com/bazaarvoice/jolt)
-Copyright 2013-2014 Bazaarvoice, Inc
-The derived work is adapted from com.bazaarvoice.jolt.chainr.ChainrBuilder.java, com.bazaarvoice.jolt.chainr.spec.ChainrSpec.java, com.bazaarvoice.jolt.chainr.spec.ChainrEntry.java and can be found in the org.apache.nifi.processors.standard.util.jolt.TransformFactory.java class.
-
-This includes derived works from Elastic Logstash (https://github.com/elastic/logstash/tree/v1.4.0/) and modified by Anthony Corbacho, and contributors.
-Copyright 2009-2013 Jordan Sissel, Pete Fritchman, and contributors.
-Copyright 2014 Anthony Corbacho, and contributors.
-The derived work consists in modifications from patterns/grok-patterns and found in the file nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestExtractGrok/patterns
-
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This product includes the following work from the Apache Hadoop project under Apache Software License V2:
+ BoundedByteArrayOutputStream.java adapted to SoftLimitBoundedByteArrayOutputStream.java
+
+This includes derived works from the Apache Software License V2 library Jolt (https://github.com/bazaarvoice/jolt)
+ Copyright 2013-2014 Bazaarvoice, Inc
+ The derived work is adapted from com.bazaarvoice.jolt.chainr.ChainrBuilder.java, com.bazaarvoice.jolt.chainr.spec.ChainrSpec.java,
+ com.bazaarvoice.jolt.chainr.spec.ChainrEntry.java and can be found in the org.apache.nifi.processors.standard.util.jolt.TransformFactory.java class.
+
******************
Apache Software License v2
******************
http://git-wip-us.apache.org/repos/asf/nifi/blob/829c02b0/nifi-toolkit/nifi-toolkit-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-assembly/NOTICE b/nifi-toolkit/nifi-toolkit-assembly/NOTICE
index 948ec89..68a17ab 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/NOTICE
+++ b/nifi-toolkit/nifi-toolkit-assembly/NOTICE
@@ -15,13 +15,6 @@ The following binary components are provided under the Apache Software License v
Apache NiFi
Copyright 2014-2016 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- This product includes the following work from the Apache Hadoop project:
-
- BoundedByteArrayOutputStream.java adapted to SoftLimitBoundedByteArrayOutputStream.java
-
(ASLv2) Apache Commons CLI
The following NOTICE information applies:
Apache Commons CLI