[incubator-skywalking] branch 5.x updated: Fix license issue of RC release vote.

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch 5.x
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/5.x by this push:
     new c3b2e33  Fix license issue of RC release vote.
c3b2e33 is described below

commit c3b2e33f689d1a4ea0bbbf96183e1469d3193065
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 5 07:05:08 2018 +0800

    Fix license issue of RC release vote.
---
 LICENSE                   | 20 ++++++++++++++------
 NOTICE                    |  6 ------
 licenses/LICENSE-antd.txt | 22 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8ae4ae5..4779181 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,12 +200,20 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-   =======================================================================
-   Apache SkyWalking Subcomponents:
+=======================================================================
+Apache SkyWalking Subcomponents:
 
-   The Apache SkyWalking project contains subcomponents with separate copyright
-   notices and license terms. Your use of the source code for the these
-   subcomponents is subject to the terms and conditions of the following
-   licenses.
+The Apache SkyWalking project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+
+========================================================================
+MIT licenses
+========================================================================
+
+The following components are provided under the MIT License. See project link for details.
+The text of each license is also included at licenses/LICENSE-[project].txt.
 
    iconfont(from antd): https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont   MIT
diff --git a/NOTICE b/NOTICE
index a442344..a1b74dd 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,9 +3,3 @@ Copyright 2017-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product bundles icons/fonts in skywalking-ui/public/font/iconfont folder
-from the ant-design project,
-https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont
-Licensed under the MIT license, confirmed by ant-design team member.
-https://github.com/ant-design/ant-design/issues/10243
\ No newline at end of file
diff --git a/licenses/LICENSE-antd.txt b/licenses/LICENSE-antd.txt
new file mode 100644
index 0000000..12189b6
--- /dev/null
+++ b/licenses/LICENSE-antd.txt
@@ -0,0 +1,22 @@
+MIT LICENSE
+
+Copyright (c) 2015-present Alipay.com, https://www.alipay.com/
+
+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.