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/03/24 03:35:56 UTC
[incubator-skywalking] branch asf/5.0-alpha/release updated: Fix
IPMC checks for releasing.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch asf/5.0-alpha/release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/asf/5.0-alpha/release by this push:
new 3b5c613 Fix IPMC checks for releasing.
3b5c613 is described below
commit 3b5c613195a7bfccff84a5b3cf6aff23ad7d061c
Author: wusheng <wu...@foxmail.com>
AuthorDate: Sat Mar 24 11:35:48 2018 +0800
Fix IPMC checks for releasing.
---
LICENSE | 87 -----------
NOTICE | 164 +--------------------
LICENSE => apm-dist/release-docs/LICENSE | 0
NOTICE => apm-dist/release-docs/NOTICE | 42 +++++-
.../release-docs/licenses}/LICENSE-BizCharts.txt | 0
.../release-docs/licenses}/LICENSE-H2.txt | 0
.../release-docs/licenses}/LICENSE-Numeral-js.txt | 0
.../release-docs/licenses}/LICENSE-ant-design.txt | 0
.../release-docs/licenses}/LICENSE-asm.txt | 0
.../release-docs/licenses}/LICENSE-babel.txt | 0
.../release-docs/licenses}/LICENSE-byte-buddy.txt | 0
.../release-docs/licenses}/LICENSE-classnames.txt | 0
.../LICENSE-cytoscape-node-html-label.txt | 0
.../LICENSE-cytoscape.js-cose-bilkent.txt | 0
.../licenses}/LICENSE-cytoscape.js.txt | 0
.../release-docs/licenses}/LICENSE-d3.txt | 0
.../release-docs/licenses}/LICENSE-data-set | 0
.../release-docs/licenses}/LICENSE-disruptor.txt | 0
.../release-docs/licenses}/LICENSE-drawer-menu.txt | 0
.../release-docs/licenses}/LICENSE-dva-loading.txt | 0
.../release-docs/licenses}/LICENSE-dva.txt | 0
.../licenses}/LICENSE-elasticsearch.txt | 0
.../release-docs/licenses}/LICENSE-fastclick.txt | 0
.../licenses}/LICENSE-graphql-java-tools.txt | 0
.../release-docs/licenses}/LICENSE-grpc-java.txt | 0
.../release-docs/licenses}/LICENSE-gson.txt | 0
.../release-docs/licenses}/LICENSE-guava.txt | 0
.../release-docs/licenses}/LICENSE-jedis.txt | 0
.../licenses}/LICENSE-jetty.project.txt | 0
.../release-docs/licenses}/LICENSE-joda-time.txt | 0
.../licenses}/LICENSE-lodash-decorators.txt | 0
.../release-docs/licenses}/LICENSE-mockito.txt | 0
.../release-docs/licenses}/LICENSE-moment.txt | 0
.../release-docs/licenses}/LICENSE-omit.js.txt | 0
.../licenses}/LICENSE-path-to-regexp.txt | 0
.../release-docs/licenses}/LICENSE-powermock.txt | 0
.../release-docs/licenses}/LICENSE-prop-types.txt | 0
.../release-docs/licenses}/LICENSE-qs.txt | 0
.../licenses}/LICENSE-react-document-title.txt | 0
.../licenses}/LICENSE-react-fittext.txt | 0
.../release-docs/licenses}/LICENSE-react.txt | 0
.../release-docs/licenses}/LICENSE-slf4j.txt | 0
.../release-docs/licenses}/LICENSE-snakeyaml.txt | 0
.../release-docs/licenses}/LICENSE-spring-boot.txt | 0
.../licenses}/LICENSE-spring-cloud-netflix.txt | 0
.../licenses}/LICENSE-url-polyfill.txt | 0
apm-dist/src/main/assembly/binary.xml | 8 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
ci-dependencies/dubbox-2.8.4.jar | Bin 1567542 -> 0 bytes
ci-dependencies/jmxri-1.2.1.jar | Bin 365858 -> 0 bytes
ci-dependencies/jmxtools-1.2.1.jar | Bin 102394 -> 0 bytes
docs/en/How-to-release.md | 3 +-
pom.xml | 68 ---------
53 files changed, 45 insertions(+), 329 deletions(-)
diff --git a/LICENSE b/LICENSE
index a645858..8dada3e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,90 +199,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.
-
-========================================================================
-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
- 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
-
-
-========================================================================
-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
- data-set: https://github.com/antvis/data-set/ , 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
- 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.
-
- 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
-
-========================================================================
-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
diff --git a/NOTICE b/NOTICE
index 5ef8686..750c8d5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,166 +2,4 @@ Apache SkyWalking
Copyright 2017-2018 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-========================================================================
-grpc-java NOTICE
-========================================================================
-Copyright 2014, gRPC Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-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.
-
------------------------------------------------------------------------
-
-This product contains a modified portion of 'OkHttp', an open source
-HTTP & SPDY client for Android and Java applications, which can be obtained
-at:
-
- * LICENSE:
- * okhttp/third_party/okhttp/LICENSE (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/square/okhttp
- * LOCATION_IN_GRPC:
- * okhttp/third_party/okhttp
-
-This product contains a modified portion of 'Netty', an open source
-networking library, which can be obtained at:
-
- * LICENSE:
- * netty/third_party/netty/LICENSE.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://netty.io
- * LOCATION_IN_GRPC:
- * netty/third_party/netty
-
-
-==============================================================
- Jetty NOTICE
-
- Jetty Web Container
- Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
-==============================================================
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted.
-
-Jetty is dual licensed under both
-
- * The Apache 2.0 License
- http://www.apache.org/licenses/LICENSE-2.0.html
-
- and
-
- * The Eclipse Public 1.0 License
- http://www.eclipse.org/legal/epl-v10.html
-
-Jetty may be distributed under either license.
-
-------
-Eclipse
-
-The following artifacts are EPL.
- * org.eclipse.jetty.orbit:org.eclipse.jdt.core
-
-The following artifacts are EPL and ASL2.
- * org.eclipse.jetty.orbit:javax.security.auth.message
-
-
-The following artifacts are EPL and CDDL 1.0.
- * org.eclipse.jetty.orbit:javax.mail.glassfish
-
-
-------
-Oracle
-
-The following artifacts are CDDL + GPLv2 with classpath exception.
-https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
-
- * javax.servlet:javax.servlet-api
- * javax.annotation:javax.annotation-api
- * javax.transaction:javax.transaction-api
- * javax.websocket:javax.websocket-api
-
-------
-Oracle OpenJDK
-
-If ALPN is used to negotiate HTTP/2 connections, then the following
-artifacts may be included in the distribution or downloaded when ALPN
-module is selected.
-
- * java.sun.security.ssl
-
-These artifacts replace/modify OpenJDK classes. The modififications
-are hosted at github and both modified and original are under GPL v2 with
-classpath exceptions.
-http://openjdk.java.net/legal/gplv2+ce.html
-
-
-------
-OW2
-
-The following artifacts are licensed by the OW2 Foundation according to the
-terms of http://asm.ow2.org/license.html
-
-org.ow2.asm:asm-commons
-org.ow2.asm:asm
-
-
-------
-Apache
-
-The following artifacts are ASL2 licensed.
-
-org.apache.taglibs:taglibs-standard-spec
-org.apache.taglibs:taglibs-standard-impl
-
-
-------
-MortBay
-
-The following artifacts are ASL2 licensed. Based on selected classes from
-following Apache Tomcat jars, all ASL2 licensed.
-
-org.mortbay.jasper:apache-jsp
- org.apache.tomcat:tomcat-jasper
- org.apache.tomcat:tomcat-juli
- org.apache.tomcat:tomcat-jsp-api
- org.apache.tomcat:tomcat-el-api
- org.apache.tomcat:tomcat-jasper-el
- org.apache.tomcat:tomcat-api
- org.apache.tomcat:tomcat-util-scan
- org.apache.tomcat:tomcat-util
-
-org.mortbay.jasper:apache-el
- org.apache.tomcat:tomcat-jasper-el
- org.apache.tomcat:tomcat-el-api
-
-
-------
-Mortbay
-
-The following artifacts are CDDL + GPLv2 with classpath exception.
-
-https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
-
-org.eclipse.jetty.toolchain:jetty-schemas
-
-------
-Assorted
-
-The UnixCrypt.java code implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/LICENSE b/apm-dist/release-docs/LICENSE
similarity index 100%
copy from LICENSE
copy to apm-dist/release-docs/LICENSE
diff --git a/NOTICE b/apm-dist/release-docs/NOTICE
similarity index 73%
copy from NOTICE
copy to apm-dist/release-docs/NOTICE
index 5ef8686..2bec2c7 100644
--- a/NOTICE
+++ b/apm-dist/release-docs/NOTICE
@@ -44,13 +44,31 @@ networking library, which can be obtained at:
* LOCATION_IN_GRPC:
* netty/third_party/netty
+========================================================================
+grpc NOTICE
+========================================================================
+
+Copyright 2014 gRPC authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
-==============================================================
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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.
+
+
+========================================================================
Jetty NOTICE
Jetty Web Container
Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
-==============================================================
+========================================================================
The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
unless otherwise noted.
@@ -165,3 +183,23 @@ modified April 2001 by Iris Van den Broeke, Daniel Deville.
Permission to use, copy, modify and distribute UnixCrypt
for non-commercial or commercial purposes and without fee is
granted provided that the copyright notice appears in all copies.
+
+========================================================================
+Elasticsearch NOTICE
+========================================================================
+
+Elasticsearch
+Copyright 2009-2017 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+========================================================================
+joda-time NOTICE
+========================================================================
+
+=============================================================================
+= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
+=============================================================================
+This product includes software developed by
+Joda.org (http://www.joda.org/).
\ No newline at end of file
diff --git a/licenses/LICENSE-BizCharts.txt b/apm-dist/release-docs/licenses/LICENSE-BizCharts.txt
similarity index 100%
rename from licenses/LICENSE-BizCharts.txt
rename to apm-dist/release-docs/licenses/LICENSE-BizCharts.txt
diff --git a/licenses/LICENSE-H2.txt b/apm-dist/release-docs/licenses/LICENSE-H2.txt
similarity index 100%
rename from licenses/LICENSE-H2.txt
rename to apm-dist/release-docs/licenses/LICENSE-H2.txt
diff --git a/licenses/LICENSE-Numeral-js.txt b/apm-dist/release-docs/licenses/LICENSE-Numeral-js.txt
similarity index 100%
rename from licenses/LICENSE-Numeral-js.txt
rename to apm-dist/release-docs/licenses/LICENSE-Numeral-js.txt
diff --git a/licenses/LICENSE-ant-design.txt b/apm-dist/release-docs/licenses/LICENSE-ant-design.txt
similarity index 100%
rename from licenses/LICENSE-ant-design.txt
rename to apm-dist/release-docs/licenses/LICENSE-ant-design.txt
diff --git a/licenses/LICENSE-asm.txt b/apm-dist/release-docs/licenses/LICENSE-asm.txt
similarity index 100%
rename from licenses/LICENSE-asm.txt
rename to apm-dist/release-docs/licenses/LICENSE-asm.txt
diff --git a/licenses/LICENSE-babel.txt b/apm-dist/release-docs/licenses/LICENSE-babel.txt
similarity index 100%
rename from licenses/LICENSE-babel.txt
rename to apm-dist/release-docs/licenses/LICENSE-babel.txt
diff --git a/licenses/LICENSE-byte-buddy.txt b/apm-dist/release-docs/licenses/LICENSE-byte-buddy.txt
similarity index 100%
rename from licenses/LICENSE-byte-buddy.txt
rename to apm-dist/release-docs/licenses/LICENSE-byte-buddy.txt
diff --git a/licenses/LICENSE-classnames.txt b/apm-dist/release-docs/licenses/LICENSE-classnames.txt
similarity index 100%
rename from licenses/LICENSE-classnames.txt
rename to apm-dist/release-docs/licenses/LICENSE-classnames.txt
diff --git a/licenses/LICENSE-cytoscape-node-html-label.txt b/apm-dist/release-docs/licenses/LICENSE-cytoscape-node-html-label.txt
similarity index 100%
rename from licenses/LICENSE-cytoscape-node-html-label.txt
rename to apm-dist/release-docs/licenses/LICENSE-cytoscape-node-html-label.txt
diff --git a/licenses/LICENSE-cytoscape.js-cose-bilkent.txt b/apm-dist/release-docs/licenses/LICENSE-cytoscape.js-cose-bilkent.txt
similarity index 100%
rename from licenses/LICENSE-cytoscape.js-cose-bilkent.txt
rename to apm-dist/release-docs/licenses/LICENSE-cytoscape.js-cose-bilkent.txt
diff --git a/licenses/LICENSE-cytoscape.js.txt b/apm-dist/release-docs/licenses/LICENSE-cytoscape.js.txt
similarity index 100%
rename from licenses/LICENSE-cytoscape.js.txt
rename to apm-dist/release-docs/licenses/LICENSE-cytoscape.js.txt
diff --git a/licenses/LICENSE-d3.txt b/apm-dist/release-docs/licenses/LICENSE-d3.txt
similarity index 100%
rename from licenses/LICENSE-d3.txt
rename to apm-dist/release-docs/licenses/LICENSE-d3.txt
diff --git a/licenses/LICENSE-data-set b/apm-dist/release-docs/licenses/LICENSE-data-set
similarity index 100%
rename from licenses/LICENSE-data-set
rename to apm-dist/release-docs/licenses/LICENSE-data-set
diff --git a/licenses/LICENSE-disruptor.txt b/apm-dist/release-docs/licenses/LICENSE-disruptor.txt
similarity index 100%
rename from licenses/LICENSE-disruptor.txt
rename to apm-dist/release-docs/licenses/LICENSE-disruptor.txt
diff --git a/licenses/LICENSE-drawer-menu.txt b/apm-dist/release-docs/licenses/LICENSE-drawer-menu.txt
similarity index 100%
rename from licenses/LICENSE-drawer-menu.txt
rename to apm-dist/release-docs/licenses/LICENSE-drawer-menu.txt
diff --git a/licenses/LICENSE-dva-loading.txt b/apm-dist/release-docs/licenses/LICENSE-dva-loading.txt
similarity index 100%
rename from licenses/LICENSE-dva-loading.txt
rename to apm-dist/release-docs/licenses/LICENSE-dva-loading.txt
diff --git a/licenses/LICENSE-dva.txt b/apm-dist/release-docs/licenses/LICENSE-dva.txt
similarity index 100%
rename from licenses/LICENSE-dva.txt
rename to apm-dist/release-docs/licenses/LICENSE-dva.txt
diff --git a/licenses/LICENSE-elasticsearch.txt b/apm-dist/release-docs/licenses/LICENSE-elasticsearch.txt
similarity index 100%
rename from licenses/LICENSE-elasticsearch.txt
rename to apm-dist/release-docs/licenses/LICENSE-elasticsearch.txt
diff --git a/licenses/LICENSE-fastclick.txt b/apm-dist/release-docs/licenses/LICENSE-fastclick.txt
similarity index 100%
rename from licenses/LICENSE-fastclick.txt
rename to apm-dist/release-docs/licenses/LICENSE-fastclick.txt
diff --git a/licenses/LICENSE-graphql-java-tools.txt b/apm-dist/release-docs/licenses/LICENSE-graphql-java-tools.txt
similarity index 100%
rename from licenses/LICENSE-graphql-java-tools.txt
rename to apm-dist/release-docs/licenses/LICENSE-graphql-java-tools.txt
diff --git a/licenses/LICENSE-grpc-java.txt b/apm-dist/release-docs/licenses/LICENSE-grpc-java.txt
similarity index 100%
rename from licenses/LICENSE-grpc-java.txt
rename to apm-dist/release-docs/licenses/LICENSE-grpc-java.txt
diff --git a/licenses/LICENSE-gson.txt b/apm-dist/release-docs/licenses/LICENSE-gson.txt
similarity index 100%
rename from licenses/LICENSE-gson.txt
rename to apm-dist/release-docs/licenses/LICENSE-gson.txt
diff --git a/licenses/LICENSE-guava.txt b/apm-dist/release-docs/licenses/LICENSE-guava.txt
similarity index 100%
rename from licenses/LICENSE-guava.txt
rename to apm-dist/release-docs/licenses/LICENSE-guava.txt
diff --git a/licenses/LICENSE-jedis.txt b/apm-dist/release-docs/licenses/LICENSE-jedis.txt
similarity index 100%
rename from licenses/LICENSE-jedis.txt
rename to apm-dist/release-docs/licenses/LICENSE-jedis.txt
diff --git a/licenses/LICENSE-jetty.project.txt b/apm-dist/release-docs/licenses/LICENSE-jetty.project.txt
similarity index 100%
rename from licenses/LICENSE-jetty.project.txt
rename to apm-dist/release-docs/licenses/LICENSE-jetty.project.txt
diff --git a/licenses/LICENSE-joda-time.txt b/apm-dist/release-docs/licenses/LICENSE-joda-time.txt
similarity index 100%
rename from licenses/LICENSE-joda-time.txt
rename to apm-dist/release-docs/licenses/LICENSE-joda-time.txt
diff --git a/licenses/LICENSE-lodash-decorators.txt b/apm-dist/release-docs/licenses/LICENSE-lodash-decorators.txt
similarity index 100%
rename from licenses/LICENSE-lodash-decorators.txt
rename to apm-dist/release-docs/licenses/LICENSE-lodash-decorators.txt
diff --git a/licenses/LICENSE-mockito.txt b/apm-dist/release-docs/licenses/LICENSE-mockito.txt
similarity index 100%
rename from licenses/LICENSE-mockito.txt
rename to apm-dist/release-docs/licenses/LICENSE-mockito.txt
diff --git a/licenses/LICENSE-moment.txt b/apm-dist/release-docs/licenses/LICENSE-moment.txt
similarity index 100%
rename from licenses/LICENSE-moment.txt
rename to apm-dist/release-docs/licenses/LICENSE-moment.txt
diff --git a/licenses/LICENSE-omit.js.txt b/apm-dist/release-docs/licenses/LICENSE-omit.js.txt
similarity index 100%
rename from licenses/LICENSE-omit.js.txt
rename to apm-dist/release-docs/licenses/LICENSE-omit.js.txt
diff --git a/licenses/LICENSE-path-to-regexp.txt b/apm-dist/release-docs/licenses/LICENSE-path-to-regexp.txt
similarity index 100%
rename from licenses/LICENSE-path-to-regexp.txt
rename to apm-dist/release-docs/licenses/LICENSE-path-to-regexp.txt
diff --git a/licenses/LICENSE-powermock.txt b/apm-dist/release-docs/licenses/LICENSE-powermock.txt
similarity index 100%
rename from licenses/LICENSE-powermock.txt
rename to apm-dist/release-docs/licenses/LICENSE-powermock.txt
diff --git a/licenses/LICENSE-prop-types.txt b/apm-dist/release-docs/licenses/LICENSE-prop-types.txt
similarity index 100%
rename from licenses/LICENSE-prop-types.txt
rename to apm-dist/release-docs/licenses/LICENSE-prop-types.txt
diff --git a/licenses/LICENSE-qs.txt b/apm-dist/release-docs/licenses/LICENSE-qs.txt
similarity index 100%
rename from licenses/LICENSE-qs.txt
rename to apm-dist/release-docs/licenses/LICENSE-qs.txt
diff --git a/licenses/LICENSE-react-document-title.txt b/apm-dist/release-docs/licenses/LICENSE-react-document-title.txt
similarity index 100%
rename from licenses/LICENSE-react-document-title.txt
rename to apm-dist/release-docs/licenses/LICENSE-react-document-title.txt
diff --git a/licenses/LICENSE-react-fittext.txt b/apm-dist/release-docs/licenses/LICENSE-react-fittext.txt
similarity index 100%
rename from licenses/LICENSE-react-fittext.txt
rename to apm-dist/release-docs/licenses/LICENSE-react-fittext.txt
diff --git a/licenses/LICENSE-react.txt b/apm-dist/release-docs/licenses/LICENSE-react.txt
similarity index 100%
rename from licenses/LICENSE-react.txt
rename to apm-dist/release-docs/licenses/LICENSE-react.txt
diff --git a/licenses/LICENSE-slf4j.txt b/apm-dist/release-docs/licenses/LICENSE-slf4j.txt
similarity index 100%
rename from licenses/LICENSE-slf4j.txt
rename to apm-dist/release-docs/licenses/LICENSE-slf4j.txt
diff --git a/licenses/LICENSE-snakeyaml.txt b/apm-dist/release-docs/licenses/LICENSE-snakeyaml.txt
similarity index 100%
rename from licenses/LICENSE-snakeyaml.txt
rename to apm-dist/release-docs/licenses/LICENSE-snakeyaml.txt
diff --git a/licenses/LICENSE-spring-boot.txt b/apm-dist/release-docs/licenses/LICENSE-spring-boot.txt
similarity index 100%
rename from licenses/LICENSE-spring-boot.txt
rename to apm-dist/release-docs/licenses/LICENSE-spring-boot.txt
diff --git a/licenses/LICENSE-spring-cloud-netflix.txt b/apm-dist/release-docs/licenses/LICENSE-spring-cloud-netflix.txt
similarity index 100%
rename from licenses/LICENSE-spring-cloud-netflix.txt
rename to apm-dist/release-docs/licenses/LICENSE-spring-cloud-netflix.txt
diff --git a/licenses/LICENSE-url-polyfill.txt b/apm-dist/release-docs/licenses/LICENSE-url-polyfill.txt
similarity index 100%
rename from licenses/LICENSE-url-polyfill.txt
rename to apm-dist/release-docs/licenses/LICENSE-url-polyfill.txt
diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml
index 9f20b4c..afdb0c0 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -59,8 +59,7 @@
<directory>${project.basedir}/../</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
+ <include>DISCLAIMER</include>
<include>CHANGES</include>
</includes>
</fileSet>
@@ -69,11 +68,6 @@
<directory>${project.basedir}/release-docs</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
-
- <fileSet>
- <directory>${project.basedir}/../licenses</directory>
- <outputDirectory>/licenses</outputDirectory>
- </fileSet>
</fileSets>
<files>
<file>
diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
index aa1f546..cae9874 100644
--- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>dubbo</artifactId>
- <version>2.5.3</version>
+ <version>2.5.10</version>
<scope>provided</scope>
</dependency>
diff --git a/ci-dependencies/dubbox-2.8.4.jar b/ci-dependencies/dubbox-2.8.4.jar
deleted file mode 100644
index 5a20705..0000000
Binary files a/ci-dependencies/dubbox-2.8.4.jar and /dev/null differ
diff --git a/ci-dependencies/jmxri-1.2.1.jar b/ci-dependencies/jmxri-1.2.1.jar
deleted file mode 100644
index 71428a6..0000000
Binary files a/ci-dependencies/jmxri-1.2.1.jar and /dev/null differ
diff --git a/ci-dependencies/jmxtools-1.2.1.jar b/ci-dependencies/jmxtools-1.2.1.jar
deleted file mode 100644
index 2e93c3b..0000000
Binary files a/ci-dependencies/jmxtools-1.2.1.jar and /dev/null differ
diff --git a/docs/en/How-to-release.md b/docs/en/How-to-release.md
index 2464a75..ee9702c 100644
--- a/docs/en/How-to-release.md
+++ b/docs/en/How-to-release.md
@@ -173,7 +173,8 @@ All PPMC members and committers should check these before vote +1.
1. `LICENSE` and `NOTICE` are in Source code and distribution package.
1. Check `shasum -c apache-skywalking-apm-incubating-x.y.z-src.tgz.sha512`
1. Build distribution from source code package (apache-skywalking-incubating-x.y.z-src.tar.gz) by following this [doc](https://github.com/apache/incubator-skywalking/blob/master/docs/en/How-to-build.md#build-from-apache-source-codes).
-1. Apache RAT check. Run `mvn apache-rat:check`.
+1. Apache RAT check. Run `mvn apache-rat:check`. (No binary in source codes)
+1. DISCLAIMER exists
## Call for a vote in Apache IPMC
Call a vote in `general@incubator.apache.org`
diff --git a/pom.xml b/pom.xml
index 436d82e..6433707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,6 @@
<!-- CI files -->
<exclude>**/.travis.yml</exclude>
- <exclude>**/ci-dependencies/**</exclude>
<!-- GitHub files -->
<exclude>**/.github/**</exclude>
@@ -220,73 +219,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.6.0</version>
- <executions>
- <execution>
- <id>install-jmxtools</id>
- <inherited>false</inherited>
- <phase>process-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>mvn</executable>
- <arguments>
- <argument>install:install-file</argument>
- <argument>-Dfile=jmxtools-1.2.1.jar</argument>
- <argument>-DgroupId=com.sun.jdmk</argument>
- <argument>-DartifactId=jmxtools</argument>
- <argument>-Dversion=1.2.1</argument>
- <argument>-Dpackaging=jar</argument>
- </arguments>
- <workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
- </configuration>
- </execution>
- <execution>
- <id>install-jmxri</id>
- <inherited>false</inherited>
- <phase>process-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>mvn</executable>
- <arguments>
- <argument>install:install-file</argument>
- <argument>-Dfile=jmxri-1.2.1.jar</argument>
- <argument>-DgroupId=com.sun.jmx</argument>
- <argument>-DartifactId=jmxri</argument>
- <argument>-Dversion=1.2.1</argument>
- <argument>-Dpackaging=jar</argument>
- </arguments>
- <workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
- </configuration>
- </execution>
- <execution>
- <id>install-dubbox</id>
- <inherited>false</inherited>
- <phase>process-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>mvn</executable>
- <arguments>
- <argument>install:install-file</argument>
- <argument>-Dfile=dubbox-2.8.4.jar</argument>
- <argument>-DgroupId=com.alibaba</argument>
- <argument>-DartifactId=dubbox</argument>
- <argument>-Dversion=2.8.4</argument>
- <argument>-Dpackaging=jar</argument>
- </arguments>
- <workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.