You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/07/11 03:12:56 UTC
[incubator-skywalking] branch master updated: Fix #1441 add icon
files notice (#1442)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new dc1dfca Fix #1441 add icon files notice (#1442)
dc1dfca is described below
commit dc1dfca010cafbe60cbd1f61cff138712e678b8c
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Jul 11 11:12:53 2018 +0800
Fix #1441 add icon files notice (#1442)
* Fix #1441 add icon files notice
* Amend notice file, add excluding icon folder in rat config
---
NOTICE | 7 ++++++-
apm-dist/release-docs/NOTICE | 7 +++++++
pom.xml | 2 ++
skywalking-ui | 2 +-
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/NOTICE b/NOTICE
index 750c8d5..fe4d0a2 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,4 +2,9 @@ Apache SkyWalking
Copyright 2017-2018 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+This product bundles icons/fonts 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/apm-dist/release-docs/NOTICE b/apm-dist/release-docs/NOTICE
index b47262d..d60cf63 100644
--- a/apm-dist/release-docs/NOTICE
+++ b/apm-dist/release-docs/NOTICE
@@ -829,3 +829,10 @@ grants independently of ICOT any specific warranty to the user in
writing, such person, organization or entity, will also be exempted
from and not be held liable to the user for any such damages as noted
above as far as the program is concerned.
+
+------
+
+This product bundles icons/fonts 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
diff --git a/pom.xml b/pom.xml
index ecf9ebd..aa5668a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,6 +172,8 @@
<!-- UI style check files -->
<exclude>**/skywalking-ui/.eslintrc</exclude>
<exclude>**/skywalking-ui/.stylelintrc</exclude>
+ <!-- UI icon files -->
+ <exclude>**/skywalking-ui/public/font/iconfont/**</exclude>
<!-- git files -->
<exclude>**/.gitignore</exclude>
diff --git a/skywalking-ui b/skywalking-ui
index 3ecf338..f9c6029 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 3ecf33899e28ac106e1d421c089c4c4a4d79c23d
+Subproject commit f9c602936ab4f386576bf16f203efac61962e424