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 2016/11/23 15:22:10 UTC
nifi git commit: NIFI-2991 This closes #1265. was allowed to restore
twitter4j json.org usage until April. Resolution for that will be in
NIFI-3089
Repository: nifi
Updated Branches:
refs/heads/master 7fc7494b2 -> 22143e386
NIFI-2991 This closes #1265. was allowed to restore twitter4j json.org usage until April. Resolution for that will be in NIFI-3089
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/22143e38
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/22143e38
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/22143e38
Branch: refs/heads/master
Commit: 22143e386d07761ca92b7cb889ec8c11d7d130e9
Parents: 7fc7494
Author: joewitt <jo...@apache.org>
Authored: Wed Nov 23 10:20:18 2016 -0500
Committer: joewitt <jo...@apache.org>
Committed: Wed Nov 23 10:21:41 2016 -0500
----------------------------------------------------------------------
nifi-assembly/NOTICE | 28 ++++++++++++++++++++
nifi-assembly/pom.xml | 2 --
.../nifi-social-media-nar/pom.xml | 15 -----------
.../src/main/resources/META-INF/NOTICE | 26 ++++++++++++++++--
4 files changed, 52 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/22143e38/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 4a93017..5711c65 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -132,6 +132,34 @@ 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/22143e38/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 0ac6225..8f6fa55 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -243,13 +243,11 @@ language governing permissions and limitations under the License. -->
<artifactId>nifi-solr-nar</artifactId>
<type>nar</type>
</dependency>
- <!-- Will restore this when the social media nar no longer has a dependency on cat-x twitter4J version
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-nar</artifactId>
<type>nar</type>
</dependency>
- -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-nar</artifactId>
http://git-wip-us.apache.org/repos/asf/nifi/blob/22143e38/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
index 9eb3391..d6f13b0 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
@@ -36,19 +36,4 @@
<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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/22143e38/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 7a35686..1118c99 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
@@ -44,8 +44,30 @@ The following binary components are provided under the Apache Software License v
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
-
+ 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