nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joew...@apache.org
Subject [50/50] [abbrv] incubator-nifi git commit: NIFI-360 removed extra LICENSE information and updated NOTICE to reflect source/copyright from Json Path
Date Mon, 02 Mar 2015 04:04:29 GMT
NIFI-360 removed extra LICENSE information and updated NOTICE to reflect source/copyright from
Json Path


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

Branch: refs/heads/develop
Commit: 67a4faf1353530aae7828252fb474e6117e13bcc
Parents: 245ec0c
Author: joewitt <joewitt@apache.org>
Authored: Sun Mar 1 23:01:31 2015 -0500
Committer: joewitt <joewitt@apache.org>
Committed: Sun Mar 1 23:01:31 2015 -0500

----------------------------------------------------------------------
 nifi/LICENSE | 22 ----------------------
 nifi/NOTICE  |  5 +++++
 2 files changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/67a4faf1/nifi/LICENSE
----------------------------------------------------------------------
diff --git a/nifi/LICENSE b/nifi/LICENSE
index d00d450..50150e3 100644
--- a/nifi/LICENSE
+++ b/nifi/LICENSE
@@ -455,25 +455,3 @@ 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/67a4faf1/nifi/NOTICE
----------------------------------------------------------------------
diff --git a/nifi/NOTICE b/nifi/NOTICE
index 9686fba..ba32a1b 100644
--- a/nifi/NOTICE
+++ b/nifi/NOTICE
@@ -4,3 +4,8 @@ Copyright 2014-2015 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+The source release of this product bundles a modified 
+version of PathCompiler from https://github.com/jayway/JsonPath 
+The following notice information applies
+  Copyright 2011 Kalle Stenflo, Jochen Berger 
+


Mime
View raw message