You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2018/07/12 06:04:28 UTC
[1/2] incubator-weex git commit: Update LICENSE
Repository: incubator-weex
Updated Branches:
refs/heads/release 20b61bdb7 -> 99041a2c8
Update 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/655109b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/655109b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/655109b1
Branch: refs/heads/release
Commit: 655109b1c3c77467027d1ed336fcc6fbfdaf967c
Parents: 20b61bd
Author: 莫绪旻 <mi...@foxmail.com>
Authored: Wed Jul 11 01:59:23 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Jul 11 01:59:23 2018 +0800
----------------------------------------------------------------------
LICENSE | 140 ++++++-----------------------------------------------------
1 file changed, 14 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/655109b1/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 661b0ce..ae64b13 100644
--- a/LICENSE
+++ b/LICENSE
@@ -222,129 +222,17 @@ This product bundles vuejs v1.0.12, which is available under a
This product bundles Guava v20.0, which is available under a "Apache" license. For details, see https://github.com/google/guava/blob/v20.0/COPYING and following files:
android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java
- For fpconv
- weex_core/Source/core/parser/dom_parser.cpp
- /*
- * Copyright (c) 2013 Andreas Samoljuk
- *
- * 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.
- */
-
- 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.
- */
-
- For flexbox-layout
- weex_core/Source/core/layout
- /*
- * Copyright (C) 2016 The flexbox-layout Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
-
- For IPC
- weex_core/Source/IPC
- /*
- * Copyright (C) 2008 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
- For JNI
- weex_core/Source/android/jniprebuild/jniheader
- /*
- * Copyright 2014 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
- For modp
- weex_core/Source/android/base
- /*
- * Copyright © 2005, 2006, Nick Galbreath -- nickg [at] modp [dot] com
- * All rights reserved.
- *
- * http://modp.com/release/base64
- *
- * Released under bsd license. See modp_b64.c for details.
- *
- * The default implementation is the standard b64 encoding with padding.
- * It's easy to change this to use "URL safe" characters and to remove
- * padding. See the modp_b64.c source code for details.
- *
- */
-
- For jni_generator
- weex_core/Source/android/jniprebuild/jni_generator.py
- /*
- * !/usr/bin/env python
- * Copyright (c) 2012 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
+This product bundles flexbox-layout v0.3.0, which is available under a "Apache" license. For details, see https://github.com/google/flexbox-layout/blob/0.3.0/LICENSE and following files:
+weex_core/Source/core/layout.h
+weex_core/Source/core/layout.cpp
+
+This product bundles linux, which is available under a "Apache" license. For details, see https://github.com/torvalds/linux/blob/master/LICENSES/other/Apache-2.0 and following files:
+weex_core/Source/IPC
+
+This product bundles jni_generator, which is available under a "BSD-style" license. For details, see https://github.com/chromium/chromium/blob/master/LICENSE and following files:
+weex_core/Source/android/jniprebuild/jniheader
+weex_core/Source/android/jniprebuild/jni_generator.py
+
+This product bundles modp, which is available under a "BSD-style" license. For details, see http://modp.com/release/base64 and following files:
+weex_core/Source/android/base/base64
+
[2/2] incubator-weex git commit: Update LICENSE
Posted by cx...@apache.org.
Update 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/99041a2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/99041a2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/99041a2c
Branch: refs/heads/release
Commit: 99041a2c88119749799605920123389fcbfb22a4
Parents: 655109b
Author: 莫绪旻 <mi...@foxmail.com>
Authored: Thu Jul 12 11:32:49 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Jul 12 11:32:49 2018 +0800
----------------------------------------------------------------------
LICENSE | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/99041a2c/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ae64b13..e3b6382 100644
--- a/LICENSE
+++ b/LICENSE
@@ -222,17 +222,8 @@ This product bundles vuejs v1.0.12, which is available under a
This product bundles Guava v20.0, which is available under a "Apache" license. For details, see https://github.com/google/guava/blob/v20.0/COPYING and following files:
android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java
-This product bundles flexbox-layout v0.3.0, which is available under a "Apache" license. For details, see https://github.com/google/flexbox-layout/blob/0.3.0/LICENSE and following files:
-weex_core/Source/core/layout.h
-weex_core/Source/core/layout.cpp
-
-This product bundles linux, which is available under a "Apache" license. For details, see https://github.com/torvalds/linux/blob/master/LICENSES/other/Apache-2.0 and following files:
-weex_core/Source/IPC
-
-This product bundles jni_generator, which is available under a "BSD-style" license. For details, see https://github.com/chromium/chromium/blob/master/LICENSE and following files:
+This product bundles chromium, which is available under a "BSD-style" license. For details, see https://github.com/chromium/chromium/blob/master/LICENSE and following files:
weex_core/Source/android/jniprebuild/jniheader
-weex_core/Source/android/jniprebuild/jni_generator.py
-
-This product bundles modp, which is available under a "BSD-style" license. For details, see http://modp.com/release/base64 and following files:
weex_core/Source/android/base/base64
+weex_core/Source/android/jniprebuild/jni_generator.py