NIFI-2991 This closes #1265. was allowed to restore twitter4j json.org usage until April. Resolution for that will be in NIFI-3089

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

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>

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>

nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE

@@ -44,7 +44,29 @@ 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: