nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jperciv...@apache.org
Subject [3/3] nifi git commit: 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
Date Tue, 15 Nov 2016 23:07:33 GMT
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>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b026f0be
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b026f0be
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b026f0be

Branch: refs/heads/master
Commit: b026f0bebe737aa62ab7de48a776d851807b1350
Parents: 6696529
Author: joewitt <joewitt@apache.org>
Authored: Tue Nov 15 16:17:48 2016 -0500
Committer: jpercivall <JPercivall@apache.org>
Committed: Tue Nov 15 18:09:27 2016 -0500

----------------------------------------------------------------------
 nifi-assembly/NOTICE                                          | 7 -------
 .../nifi-aws-nar/src/main/resources/META-INF/NOTICE           | 1 -
 .../nifi-flume-nar/src/main/resources/META-INF/NOTICE         | 6 ------
 .../nifi-social-media-bundle/nifi-social-media-nar/pom.xml    | 4 ++++
 4 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index e920ff6..d785dab 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -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

http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
index 38cb6eb..5ae7a45 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE
@@ -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.
 
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
index 7d73ff9..a154d24 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/src/main/resources/META-INF/NOTICE
@@ -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

http://git-wip-us.apache.org/repos/asf/nifi/blob/b026f0be/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 add42d4..9eb3391 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,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>


Mime
View raw message