This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch license
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/license by this push:
new bf58f00 Update license and notice files.
bf58f00 is described below
commit bf58f00e2bd70d25b3a83343810d1d2bb12bbfa4
Author: wusheng <wu.sh...@foxmail.com>
AuthorDate: Sun Mar 11 21:11:28 2018 +0800
Update license and notice files.
---
LICENSE | 94 +++++++++++++++++++++++++++++++++++
NOTICE | 56 ++-------------------
apm-dist/src/main/assembly/binary.xml | 5 ++
3 files changed, 103 insertions(+), 52 deletions(-)
diff --git a/LICENSE b/LICENSE
index 8dada3e..71289ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,97 @@
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.
+
+=======================================================================
+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.
+
+================================================================
+For org.ow2.asm:asm:jar:5.0.4
+================================================================
+
+This product bundles asm which is licensed under the
+France Telecom asm open source license.
+For details, see https://gitlab.ow2.org/asm/asm/blob/master/LICENSE.txt
+You can find a copy of the License at licenses/LICENSE-asm
+
+
+========================================================================
+Apache 2.0 licenses
+========================================================================
+
+The following components are provided under the Apache License. See project
link for details.
+The text of each license is also included at licenses/LICENSE-[project].txt.
+
+ raphw (byte-buddy): http://bytebuddy.net/ , Apache 2.0
+ Google: grpc: https://grpc.io/ , Apache 2.0
+ Google: guava: https://github.com/google/guava , Apache 2.0
+ Google: gson: https://github.com/google/gson , Apache 2.0
+ Elasticsearch BV (Elasticsearch):
https://www.elastic.co/products/elasticsearch , Apache 2.0
+ LMAX Ltd.(disruptor): https://github.com/LMAX-Exchange/disruptor , Apache
2.0
+ powermock: https://github.com/powermock/powermock , Apache 2.0
+ Eclipse (Jetty): https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse
Public License 1.0
+ SnakeYAML: http://www.snakeyaml.org , Apache 2.0
+ Joda-Time: http://www.joda.org/joda-time/ , Apache 2.0
+
+
+========================================================================
+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.
+
+ mockito: http://site.mockito.org/ , MIT
+ QOS.ch (slf4j): https://www.slf4j.org/ , MIT
+ Jedis: https://github.com/xetorthio/jedis , MIT
+ GraphQL Java Tools: https://github.com/graphql-java/graphql-java-tools ,
MIT
+ antd: https://github.com/ant-design/ant-design , MIT
+ babel-runtime:
https://github.com/babel/babel/tree/master/packages/babel-runtime , MIT
+ bizcharts-plugin-slider: https://github.com/alibaba/BizCharts , MIT
+ bizcharts: https://github.com/alibaba/BizCharts , MIT
+ classnames: https://github.com/JedWatson/classnames/raw/master/LICENSE ,
MIT
+ cytoscape-cose-bilkent:
https://github.com/cytoscape/cytoscape.js-cose-bilkent , MIT
+ cytoscape-node-html-label:
https://github.com/kaluginserg/cytoscape-node-html-label , MIT
+ cytoscape: https://github.com/cytoscape/cytoscape.js , MIT
+ d3: https://github.com/d3/d3 , MIT
+ dva-loading: https://github.com/dvajs/dva , MIT
+ dva: https://github.com/dvajs/dva , MIT
+ enquire-js: https://github.com/jljsj/enquire-js , MIT
+ fastclick: https://github.com/ftlabs/fastclick , MIT
+ lodash-decorators: https://github.com/steelsojka/lodash-decorators , MIT
+ lodash: https://github.com/lodash/lodash , MIT
+ moment: https://github.com/moment/moment , MIT
+ numeral: https://github.com/adamwdraper/Numeral-js , MIT
+ omit.js: https://github.com/benjycui/omit.js , MIT
+ path-to-regexp: https://github.com/pillarjs/path-to-regexp , MIT
+ prop-types: https://github.com/facebook/prop-types , MIT
+ rc-drawer-menu: https://github.com/ant-motion/drawer-menu , MIT
+ react-container-query: https://github.com/d6u/react-container-query , MIT
+ react-document-title: https://github.com/gaearon/react-document-title , MIT
+ react-dom: https://github.com/facebook/react , MIT
+ react-fittext: https://github.com/gianu/react-fittext , MIT
+ react: https://github.com/facebook/react , MIT
+ url-polyfill: https://github.com/lifaon74/url-polyfill , MIT
+
+========================================================================
+BSD-3 licenses
+========================================================================
+
+The following components are provided under a BSD-3 license. See project link
for details.
+The text of each license is also included at licenses/LICENSE-[project].txt.
+
+ qs: https://github.com/ljharb/qs , BSD-3-Clause
+
+========================================================================
+MPL 2.0 licenses
+========================================================================
+
+The following components are provided under a MPL 2.0 license. See project
link for details.
+The text of each license is also included at licenses/LICENSE-[project].txt.
+
+ H2 Database: http://www.h2database.com/html/main.html , MPL 2.0 or EPL 1.0
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index f39f1d7..b5c6544 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,53 +1,5 @@
-Apache SkyWalking
-Copyright 2015-2018 The Apache Software Foundation
+Apache SkyWaling
+Copyright 2017-2018 The Apache Software Foundation
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
-
-The binary distribution contains software developed by:
-
-raphw (byte-buddy): http://bytebuddy.net/ , Apache 2.0
-INRIA, France Telecom (asm): http://asm.ow2.org/ ,
[asmdex-license](http://asm.ow2.org/asmdex-license.html)
-Google:
-- grpc: https://grpc.io/ , Apache 2.0
-- guava: https://github.com/google/guava , Apache 2.0
-- gson: https://github.com/google/gson , Apache 2.0
-Elasticsearch BV (Elasticsearch):
https://www.elastic.co/products/elasticsearch , Apache 2.0
-H2 Database: http://www.h2database.com/html/main.html , MPL 2.0 or EPL 1.0
-LMAX Ltd.(disruptor): https://github.com/LMAX-Exchange/disruptor , Apache 2.0
-mockito: http://site.mockito.org/ , MIT
-QOS.ch (slf4j): https://www.slf4j.org/ , MIT
-powermock: https://github.com/powermock/powermock , Apache 2.0
-Eclipse (Jetty): https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse
Public License 1.0
-SnakeYAML: http://www.snakeyaml.org , Apache 2.0
-Jedis: https://github.com/xetorthio/jedis , MIT
-Joda-Time: http://www.joda.org/joda-time/ , Apache 2.0
-GraphQL Java Tools: https://github.com/graphql-java/graphql-java-tools , MIT
-antd: https://github.com/ant-design/ant-design , MIT
-babel-runtime:
https://github.com/babel/babel/tree/master/packages/babel-runtime , MIT
-bizcharts-plugin-slider: https://github.com/alibaba/BizCharts , MIT
-bizcharts: https://github.com/alibaba/BizCharts , MIT
-classnames: https://github.com/JedWatson/classnames/raw/master/LICENSE , MIT
-cytoscape-cose-bilkent: https://github.com/cytoscape/cytoscape.js-cose-bilkent
, MIT
-cytoscape-node-html-label:
https://github.com/kaluginserg/cytoscape-node-html-label , MIT
-cytoscape: https://github.com/cytoscape/cytoscape.js , MIT
-d3: https://github.com/d3/d3 , MIT
-dva-loading: https://github.com/dvajs/dva , MIT
-dva: https://github.com/dvajs/dva , MIT
-enquire-js: https://github.com/jljsj/enquire-js , MIT
-fastclick: https://github.com/ftlabs/fastclick , MIT
-lodash-decorators: https://github.com/steelsojka/lodash-decorators , MIT
-lodash: https://github.com/lodash/lodash , MIT
-moment: https://github.com/moment/moment , MIT
-numeral: https://github.com/adamwdraper/Numeral-js , MIT
-omit.js: https://github.com/benjycui/omit.js , MIT
-path-to-regexp: https://github.com/pillarjs/path-to-regexp , MIT
-prop-types: https://github.com/facebook/prop-types , MIT
-qs: https://github.com/ljharb/qs , BSD-3-Clause
-rc-drawer-menu: https://github.com/ant-motion/drawer-menu , MIT
-react-container-query: https://github.com/d6u/react-container-query , MIT
-react-document-title: https://github.com/gaearon/react-document-title , MIT
-react-dom: https://github.com/facebook/react , MIT
-react-fittext: https://github.com/gianu/react-fittext , MIT
-react: https://github.com/facebook/react , MIT
-url-polyfill: https://github.com/lifaon74/url-polyfill , MIT
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/apm-dist/src/main/assembly/binary.xml
b/apm-dist/src/main/assembly/binary.xml
index 16a8fa5..3dd3426 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -62,6 +62,11 @@
<include>LICENSE</include>
</includes>
</fileSet>
+
+ <fileSet>
+ <directory>${project.basedir}/../licenses</directory>
+ <outputDirectory>/licenses</outputDirectory>
+ </fileSet>
</fileSets>
<files>
<file>
--
To stop receiving notification emails like this one, please contact
wush...@apache.org.
