Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-2991 removed json.org references as appropriate for build. Twitter proc no longer deployed but reference kept in notice just in case someone uses it 

This closes #1230

Signed-off-by: jpercivall <JPercivall@apache.org>
This commit is contained in:
joewitt 2016-11-15 16:17:48 -05:00 committed by jpercivall
parent 6696529c99
commit b026f0bebe
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-assembly/NOTICE
View File

@ -780,12 +780,6 @@ 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) 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) JOAuth
The following NOTICE information applies:
JOAuth
@ -821,7 +815,6 @@ The following binary components are provided under the Apache Software License v
**********************
This software includes third party software subject to the following copyrights:
- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
- JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org.
- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
(ASLv2) Apache Commons DBCP

1
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
View File

@ -68,7 +68,6 @@ The following binary components are provided under the Apache Software License v
**********************
This software includes third party software subject to the following copyrights:
- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
- JSON parsing and utility functions from JSON.org - Copyright 2002 JSON.org.
- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.

6
nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
View File

@ -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

4
nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
View File

@ -36,6 +36,10 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<!-- This is here to ensure we do not publish the nar since it would at present
publish a cat-x dependency. Since this is optional it is ok to have the jar/bundle
and it allows people to build it and use it themselves. Once the dependency - twitter4j
no longer uses this cat-x dependency we'll be ok to return it back to normal -->
<build>
<plugins>
<plugin>