You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2017/04/11 19:08:13 UTC
nifi git commit: NIFI-3692 This closes #1663. Use hbc-core instead of
hbc-twitter4j in social-media bundle to resolve org.json cat-x
Repository: nifi
Updated Branches:
refs/heads/master 7c19796eb -> 4a8398bb3
NIFI-3692 This closes #1663. Use hbc-core instead of hbc-twitter4j in social-media bundle to resolve org.json cat-x
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4a8398bb
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4a8398bb
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4a8398bb
Branch: refs/heads/master
Commit: 4a8398bb31173f4a00bb52bbf227af0c5b49876d
Parents: 7c19796
Author: Joey Frazee <jf...@apache.org>
Authored: Tue Apr 11 10:19:44 2017 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Apr 11 14:25:04 2017 -0400
----------------------------------------------------------------------
nifi-assembly/NOTICE | 28 ------------------
.../src/main/resources/META-INF/NOTICE | 30 +-------------------
.../nifi-twitter-processors/pom.xml | 6 +++-
3 files changed, 6 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/4a8398bb/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 5b4c449..758f294 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -132,34 +132,6 @@ The following binary components are provided under the Apache Software License v
Apache Commons Logging
Copyright 2003-2014 The Apache Software Foundation
- (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
-
- Copyright (c) 2002 JSON.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of this
- software and associated documentation files (the "Software"), to deal in the Software
- without restriction, including without limitation the rights to use, copy, modify,
- merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- The Software shall be used for Good, not Evil.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
(ASLv2) Apache Commons VFS
The following NOTICE information applies:
Apache Commons VFS
http://git-wip-us.apache.org/repos/asf/nifi/blob/4a8398bb/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
index dfcff13..be0cbe2 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
@@ -40,39 +40,11 @@ The following binary components are provided under the Apache Software License v
Apache Commons Logging
Copyright 2003-2013 The Apache Software Foundation
- (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
-
- Copyright (c) 2002 JSON.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of this
- software and associated documentation files (the "Software"), to deal in the Software
- without restriction, including without limitation the rights to use, copy, modify,
- merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- The Software shall be used for Good, not Evil.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
(ASLv2) JOAuth
The following NOTICE information applies:
JOAuth
Copyright 2010-2013 Twitter, Inc
-
+
(ASLv2) Hosebird Client
The following NOTICE information applies:
Hosebird Client (hbc)
http://git-wip-us.apache.org/repos/asf/nifi/blob/4a8398bb/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index 6cbdd73..b0ddb80 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -36,13 +36,17 @@
</dependency>
<dependency>
<groupId>com.twitter</groupId>
- <artifactId>hbc-twitter4j</artifactId>
+ <artifactId>hbc-core</artifactId>
<version>2.2.0</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.twitter4j</groupId>
+ <artifactId>twitter4j-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>