You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/04/28 06:53:32 UTC
[04/48] incubator-weex git commit: * [android] Add rapidjson license
* [android] Add rapidjson license
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fa2fdb79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fa2fdb79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fa2fdb79
Branch: refs/heads/master
Commit: fa2fdb79af1620e87d4d5ec3a928c3039991a4bf
Parents: 2f8caed
Author: miomin <69...@qq.com>
Authored: Thu Apr 26 12:04:01 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Sat Apr 28 14:51:47 2018 +0800
----------------------------------------------------------------------
LICENSE | 23 ++++++++++++++++++++++-
POSSIBLE-NOTICES-FOR-BIN-DIST | 8 ++++----
2 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fa2fdb79/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index c54354a..a459980 100644
--- a/LICENSE
+++ b/LICENSE
@@ -302,4 +302,25 @@ android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
\ No newline at end of file
+ */
+
+ For rapidjson
+ weex_core/Source/core/parser/dom_parser.cpp
+ /*
+ * Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+ *
+ * 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-weex/blob/fa2fdb79/POSSIBLE-NOTICES-FOR-BIN-DIST
----------------------------------------------------------------------
diff --git a/POSSIBLE-NOTICES-FOR-BIN-DIST b/POSSIBLE-NOTICES-FOR-BIN-DIST
index 6591f3e..78d1a06 100644
--- a/POSSIBLE-NOTICES-FOR-BIN-DIST
+++ b/POSSIBLE-NOTICES-FOR-BIN-DIST
@@ -49,9 +49,6 @@ by facebook , licensed under the BSD-3-Clause License.
This product contains software animated-gif(https://github.com/facebook/fresco) developed
by facebook , licensed under the BSD-3-Clause License.
-This product contains software yoga(https://github.com/facebook/yoga) developed
-by facebook , licensed under the BSD-3-Clause License.
-
This product contains software SocketRocket(https://github.com/facebook/SocketRocket) developed
by facebook , licensed under the BSD-3-Clause License.
@@ -80,4 +77,7 @@ This product contains software Guava(https://github.com/google/guava) developed
by google , licensed under the Apache License.
This product contains shelljs Guava(https://github.com/shelljs/shelljs) developed
-by shelljs , licensed under BSD 3-clause "New" or "Revised" License.
\ No newline at end of file
+by shelljs , licensed under BSD 3-clause "New" or "Revised" License.
+
+This product contains software rapidjson(https://github.com/Tencent/rapidjson) developed
+by tencent , licensed under the MIT License.