nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joew...@apache.org
Subject [48/50] [abbrv] incubator-nifi git commit: Adding licensing and notice information for JsonPath
Date Mon, 02 Mar 2015 04:04:27 GMT
Adding licensing and notice information for JsonPath


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

Branch: refs/heads/develop
Commit: e6ebaa4ced457785f33df39c8635056d8a683ac4
Parents: 4618f46
Author: Aldrin Piri <aldrinpiri@gmail.com>
Authored: Sun Mar 1 21:42:56 2015 -0500
Committer: Aldrin Piri <aldrinpiri@gmail.com>
Committed: Sun Mar 1 21:42:56 2015 -0500

----------------------------------------------------------------------
 nifi/LICENSE                                    | 22 ++++++++++++++++++++
 nifi/nifi-assembly/NOTICE                       |  4 ++++
 .../src/main/resources/META-INF/NOTICE          |  6 +++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e6ebaa4c/nifi/LICENSE
----------------------------------------------------------------------
diff --git a/nifi/LICENSE b/nifi/LICENSE
index 50150e3..d00d450 100644
--- a/nifi/LICENSE
+++ b/nifi/LICENSE
@@ -455,3 +455,25 @@ This product bundles 'json2.js' which is available in the 'public domain'.
 This product bundles 'reset.css' which is available in the 'public domain'.
     For details see http://meyerweb.com/eric/tools/css/reset/
 
+This product bundles source from 'JsonPath'. Specifically the 'PathCompiler'.
+The source is available under an Apache Software License 2.0.
+
+    Copyright (C) 2012-2015 Dan Allen, Ryan Waldron and the Asciidoctor Project
+
+    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 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.

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e6ebaa4c/nifi/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/NOTICE b/nifi/nifi-assembly/NOTICE
index 1667e9e..025d265 100644
--- a/nifi/nifi-assembly/NOTICE
+++ b/nifi/nifi-assembly/NOTICE
@@ -466,6 +466,10 @@ The following binary components are provided under the Apache Software
License v
     The following NOTICE information applies:
       Copyright 2011 JSON-SMART authors
 
+   (ASLv2) JsonPath
+     The following NOTICE information applies:
+       Copyright 2011 JsonPath authors
+
 ************************
 Common Development and Distribution License 1.1
 ************************

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e6ebaa4c/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
index d63a74d..18961c5 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
@@ -82,7 +82,11 @@ The following binary components are provided under the Apache Software
License v
   (ASLv2) JSON-SMART
     The following NOTICE information applies:
       Copyright 2011 JSON-SMART authors
-      
+
+  (ASLv2) JsonPath
+    The following NOTICE information applies:
+      Copyright 2011 JsonPath authors
+
 ************************
 Common Development and Distribution License 1.1
 ************************


Mime
View raw message