You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/03/01 00:14:24 UTC
[25/34] geode git commit: GEODE-2142: Removal of offending JSON.ORG
code and license information
GEODE-2142: Removal of offending JSON.ORG code and license information
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a2f47b72
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a2f47b72
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a2f47b72
Branch: refs/heads/GEODE-4160-mockito
Commit: a2f47b724d0894811d77ce92c524e3eba4ed34f2
Parents: 76ea6c3
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Feb 17 14:22:55 2017 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Mon Feb 27 07:18:55 2017 -0800
----------------------------------------------------------------------
NOTICE | 4 +---
geode-assembly/src/main/dist/LICENSE | 30 ------------------------------
2 files changed, 1 insertion(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a2f47b72/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 13a30d3..d27ae96 100644
--- a/NOTICE
+++ b/NOTICE
@@ -18,6 +18,4 @@ Copyright 2016 AddThis
Copyright 2014 The Apache Software Foundation
This product includes software developed by the MX4J
-project (http://mx4j.sourceforge.net).
-
-This project includes software licensed under the JSON license.
+project (http://mx4j.sourceforge.net).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/a2f47b72/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index a00b0c3..2f2de95 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -595,36 +595,6 @@ Federal Courts of the Northern District of California and the state courts
of the State of California, with venue lying in Santa Clara County,
California.
-
----------------------------------------------------------------------------
-The JSON License (http://www.json.org/license.html)
----------------------------------------------------------------------------
-
-Apache Geode bundles the following file under the JSON license:
-
- - JSON (http://www.json.org), 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.
-
-
---------------------------------------------------------------------------
The MIT License (http://opensource.org/licenses/mit-license.html)
---------------------------------------------------------------------------