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 75a046c Release patch (#929)
75a046c is described below
commit 75a046c2a6e68e00dc72c6079a9fb78d35a50620
Author: 彭勇升 pengys <8082...@qq.com>
AuthorDate: Mon Mar 12 17:35:17 2018 +0800
Release patch (#929)
* Add more dependency licenses.
* Change the asm component’s license.
---
LICENSE | 14 +---
LICENSE => licenses/LICENSE-spring-boot.txt | 96 +--------------------
.../LICENSE-spring-cloud-netflix.txt | 98 +---------------------
pom.xml | 17 ++++
4 files changed, 26 insertions(+), 199 deletions(-)
diff --git a/LICENSE b/LICENSE
index 8e2e745..44f7952 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,16 +208,6 @@ 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
========================================================================
@@ -235,6 +225,9 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
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
+ Spring Boot: https://spring.io/, Apache 2.0
+ Spring Cloud: http://projects.spring.io/spring-cloud/, Apache-2.0
+ Spring Cloud Netflix Zuul:
https://github.com/spring-cloud/spring-cloud-netflix, Apache 2.0
========================================================================
@@ -281,6 +274,7 @@ 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.
+ asm:https://gitlab.ow2.org , BSD-3-Clause
d3: https://github.com/d3/d3 , BSD-3-Clause
qs: https://github.com/ljharb/qs , BSD-3-Clause
diff --git a/LICENSE b/licenses/LICENSE-spring-boot.txt
similarity index 70%
copy from LICENSE
copy to licenses/LICENSE-spring-boot.txt
index 8e2e745..82714d7 100644
--- a/LICENSE
+++ b/licenses/LICENSE-spring-boot.txt
@@ -1,3 +1,4 @@
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -198,97 +199,4 @@
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.
-
-=======================================================================
-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 , 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
- 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.
-
- d3: https://github.com/d3/d3 , BSD-3-Clause
- 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
+ limitations under the License.
\ No newline at end of file
diff --git a/LICENSE b/licenses/LICENSE-spring-cloud-netflix.txt
similarity index 70%
copy from LICENSE
copy to licenses/LICENSE-spring-cloud-netflix.txt
index 8e2e745..d645695 100644
--- a/LICENSE
+++ b/licenses/LICENSE-spring-cloud-netflix.txt
@@ -1,3 +1,4 @@
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -178,7 +179,7 @@
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
+ boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
@@ -186,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright {yyyy} {name of copyright owner}
+ Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -199,96 +200,3 @@
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 , 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
- 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.
-
- d3: https://github.com/d3/d3 , BSD-3-Clause
- 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/pom.xml b/pom.xml
index 3a4eb43..1275ca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,23 @@
<version>1.6.0</version>
<executions>
<execution>
+ <id>git submodule update</id>
+ <phase>initialize</phase>
+ <inherited>false</inherited>
+ <configuration>
+ <executable>git</executable>
+ <arguments>
+ <argument>submodule</argument>
+ <argument>update</argument>
+ <argument>--init</argument>
+ <argument>--recursive</argument>
+ </arguments>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ <execution>
<id>install-jmxtools</id>
<inherited>false</inherited>
<phase>process-resources</phase>
--
To stop receiving notification emails like this one, please contact
wush...@apache.org.
