Repository: incubator-weex Updated Branches: refs/heads/release 857843034 -> 48eb44e85
* [LICENSE] Change vuejs dependency in LICENSE according to apache rules [1] [2] [1] http://apache.org/dev/licensing-howto.html#permissive-deps [2] https://www.apache.org/legal/src-headers.html#3party Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/48eb44e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/48eb44e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/48eb44e8 Branch: refs/heads/release Commit: 48eb44e8560cfc574e875b7ccc64ff3834b5d30c Parents: 8578430 Author: Adam Feng <cxfe...@gmail.com> Authored: Thu Jul 5 11:36:25 2018 +0800 Committer: Adam Feng <cxfe...@gmail.com> Committed: Thu Jul 5 11:36:25 2018 +0800 ---------------------------------------------------------------------- LICENSE | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/48eb44e8/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 422d450..899d5c9 100644 --- a/LICENSE +++ b/LICENSE @@ -202,38 +202,22 @@ limitations under the License. -*/ - -For the vuejs components: -runtime/frameworks/legacy/core/array.js -runtime/frameworks/legacy/core/dep.js -runtime/frameworks/legacy/core/object.js -runtime/frameworks/legacy/core/observer.js -runtime/frameworks/legacy/core/state.js -runtime/frameworks/legacy/core/watcher.js -/* -The MIT License (MIT) - -Copyright (c) 2013-2015 Yuxi Evan You - -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. -*/ +============================================================================== + +Apache Weex Submodules: + +Apache Weex includes a number of submodules with separate copyright notices +and license terms. Your use of these submodules is subject to the terms and +conditions of the following licenses. + +This product bundles vuejs v1.0.12, which is available under a +"MIT" license. For details, see https://github.com/vuejs/vue/blob/v1.0.12/LICENSE and following files: + runtime/frameworks/legacy/core/array.js + runtime/frameworks/legacy/core/dep.js + runtime/frameworks/legacy/core/object.js + runtime/frameworks/legacy/core/observer.js + runtime/frameworks/legacy/core/state.js + runtime/frameworks/legacy/core/watcher.js For Guava android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java