Updated Branches: refs/heads/master 1ab982d1f -> 30702f091
JSON isn't in the source distro. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/30702f09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/30702f09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/30702f09 Branch: refs/heads/master Commit: 30702f091fe5e99e7adbc48443939354481d95b8 Parents: 1ab982d Author: williamstw <[email protected]> Authored: Mon Aug 19 19:57:54 2013 -0400 Committer: williamstw <[email protected]> Committed: Mon Aug 19 19:57:54 2013 -0400 ---------------------------------------------------------------------- distribution/src/main/resources/LICENSE-src.txt | 14 -------------- distribution/src/main/resources/NOTICE-src.txt | 2 -- 2 files changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/30702f09/distribution/src/main/resources/LICENSE-src.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/LICENSE-src.txt b/distribution/src/main/resources/LICENSE-src.txt index 446f951..ab7543e 100644 --- a/distribution/src/main/resources/LICENSE-src.txt +++ b/distribution/src/main/resources/LICENSE-src.txt @@ -204,20 +204,6 @@ ========================================================================== The Apache License, Version 2.0 applies to the following libraries: Bootstrap, Backbone Extension, Bootstrap Modal Helper - -========================================================================== -This product bundles JSON, which is available under the following license: --------------------------------------------------------------------------- -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. - ========================================================================== This product bundles the following, which is available under the MIT License: jQuery http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/30702f09/distribution/src/main/resources/NOTICE-src.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/NOTICE-src.txt b/distribution/src/main/resources/NOTICE-src.txt index 4ee237a..e9328e4 100644 --- a/distribution/src/main/resources/NOTICE-src.txt +++ b/distribution/src/main/resources/NOTICE-src.txt @@ -4,7 +4,5 @@ Copyright 2012-2013 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -This project includes: - JSON (JavaScript Object Notation) under provided without support or warranty
