This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch update_license
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/update_license by this push:
new 5ac3916 remove JSON License
5ac3916 is described below
commit 5ac3916afbca63b5f1d6cdf28af49b44467bdb68
Author: qiaojialin <[email protected]>
AuthorDate: Wed Mar 13 08:58:18 2019 +0800
remove JSON License
---
License | 4 ----
licenses-binary/The JSON License | 11 -----------
2 files changed, 15 deletions(-)
diff --git a/License b/License
index beeabde..f18d55f 100644
--- a/License
+++ b/License
@@ -252,10 +252,6 @@ MIT License
-----------
org.slf4j:slf4j-api
-JSON License
------------
-org.json:json http://www.JSON.org/
-
EPL 1.0 / LGPL 2.1
-----------
ch.qio.logback:logback-classic
diff --git a/licenses-binary/The JSON License b/licenses-binary/The JSON License
deleted file mode 100644
index 8279ec6..0000000
--- a/licenses-binary/The JSON License
+++ /dev/null
@@ -1,11 +0,0 @@
-The JSON 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.
\ No newline at end of file
