This is an automated email from the ASF dual-hosted git repository. pengys pushed a commit to branch asf/5.0-alpha/release in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit ca57f665cabbc8254a4561529cd53de9e1c8e059 Merge: dcf78e5 5360bdf Author: peng-yongsheng <[email protected]> AuthorDate: Sun Mar 18 21:16:44 2018 +0800 Merge branch 'asf/5.0-alpha/release' of https://github.com/apache/incubator-skywalking into asf/5.0-alpha/release # Conflicts: # apm-dist/pom.xml # apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml # apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml # apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml # apm-webapp/pom.xml .travis.yml | 2 +- CHANGELOG.md => CHANGES.md | 4 +- .../apm-toolkit-log4j-1.x/pom.xml | 6 ++- .../apm-toolkit-log4j-2.x/pom.xml | 6 ++- .../apm-toolkit-logback-1.x/pom.xml | 6 ++- .../apm-toolkit-opentracing/pom.xml | 6 ++- apm-application-toolkit/apm-toolkit-trace/pom.xml | 6 ++- apm-application-toolkit/pom.xml | 5 ++- apm-checkstyle/pom.xml | 6 ++- .../agent-grpc/agent-grpc-define/pom.xml | 6 ++- .../agent-grpc/agent-grpc-provider/pom.xml | 6 ++- .../apm-collector-agent/agent-grpc/pom.xml | 6 ++- .../agent-jetty/agent-jetty-define/pom.xml | 6 ++- .../agent-jetty/agent-jetty-provider/pom.xml | 6 ++- .../apm-collector-agent/agent-jetty/pom.xml | 6 ++- apm-collector/apm-collector-agent/pom.xml | 6 ++- .../analysis-alarm/alarm-define/pom.xml | 6 ++- .../analysis-alarm/alarm-provider/pom.xml | 6 ++- .../apm-collector-analysis/analysis-alarm/pom.xml | 6 ++- .../baseline-computing-define/pom.xml | 6 ++- .../baseline-computing-provider/pom.xml | 6 ++- .../analysis-baseline/pom.xml | 6 ++- .../analysis-jvm/jvm-define/pom.xml | 6 ++- .../analysis-jvm/jvm-provider/pom.xml | 6 ++- .../apm-collector-analysis/analysis-jvm/pom.xml | 6 ++- .../analysis-metric/metric-define/pom.xml | 6 ++- .../analysis-metric/metric-provider/pom.xml | 6 ++- .../apm-collector-analysis/analysis-metric/pom.xml | 6 ++- .../analysis-register/pom.xml | 6 ++- .../analysis-register/register-define/pom.xml | 6 ++- .../analysis-register/register-provider/pom.xml | 6 ++- .../analysis-segment-parser/pom.xml | 6 ++- .../segment-parser-define/pom.xml | 6 ++- .../segment-parser-provider/pom.xml | 6 ++- .../analysis-worker-model/pom.xml | 8 ++-- apm-collector/apm-collector-analysis/pom.xml | 6 ++- apm-collector/apm-collector-boot/pom.xml | 6 ++- .../collector-cache-define/pom.xml | 6 ++- .../collector-cache-guava-provider/pom.xml | 6 ++- apm-collector/apm-collector-cache/pom.xml | 6 ++- .../collector-cluster-define/pom.xml | 6 ++- .../collector-cluster-redis-provider/pom.xml | 6 ++- .../collector-cluster-standalone-provider/pom.xml | 6 ++- .../collector-cluster-zookeeper-provider/pom.xml | 6 ++- apm-collector/apm-collector-cluster/pom.xml | 6 ++- .../client-component/pom.xml | 6 ++- apm-collector/apm-collector-component/pom.xml | 6 ++- .../server-component/pom.xml | 6 ++- .../collector-configuration-define/pom.xml | 6 ++- .../collector-configuration-provider/pom.xml | 6 ++- apm-collector/apm-collector-configuration/pom.xml | 6 ++- apm-collector/apm-collector-core/pom.xml | 6 ++- .../collector-grpc-manager-define/pom.xml | 6 ++- .../collector-grpc-manager-provider/pom.xml | 6 ++- apm-collector/apm-collector-grpc-manager/pom.xml | 6 ++- apm-collector/apm-collector-instrument/pom.xml | 6 ++- .../collector-jetty-manager-define/pom.xml | 6 ++- .../collector-jetty-manager-provider/pom.xml | 6 ++- apm-collector/apm-collector-jetty-manager/pom.xml | 6 ++- .../collector-naming-define/pom.xml | 6 ++- .../collector-naming-jetty-provider/pom.xml | 6 ++- apm-collector/apm-collector-naming/pom.xml | 6 ++- .../collector-remote-define/pom.xml | 6 ++- .../collector-remote-grpc-provider/pom.xml | 6 ++- .../collector-remote-kafka-provider/pom.xml | 6 ++- apm-collector/apm-collector-remote/pom.xml | 6 ++- .../collector-storage-define/pom.xml | 6 ++- .../collector-storage-es-provider/pom.xml | 6 ++- .../collector-storage-h2-provider/pom.xml | 6 ++- apm-collector/apm-collector-storage/pom.xml | 6 ++- .../apm-collector-ui/collector-ui-define/pom.xml | 6 ++- .../apm-collector-ui/collector-ui-graphql/pom.xml | 6 ++- .../collector-ui-jetty-provider/pom.xml | 6 ++- apm-collector/apm-collector-ui/pom.xml | 6 ++- apm-collector/pom.xml | 6 ++- apm-commons/apm-datacarrier/pom.xml | 6 ++- apm-commons/apm-util/pom.xml | 5 ++- apm-commons/pom.xml | 5 ++- apm-dist/pom.xml | 3 +- apm-dist/release-docs/README.txt | 49 ++++++++++++++++++++++ apm-dist/src/main/assembly/binary.xml | 7 ++++ apm-protocol/apm-network/pom.xml | 6 ++- apm-protocol/apm-ui-protocol/pom.xml | 6 ++- apm-protocol/pom.xml | 6 ++- apm-sniffer/apm-agent-core/pom.xml | 10 +++-- apm-sniffer/apm-agent/pom.xml | 20 +++++---- apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 5 ++- .../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 6 ++- .../feign-default-http-9.x-plugin/pom.xml | 6 ++- apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 6 ++- apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 5 ++- .../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 6 ++- .../httpasyncclient-4.x-plugin/pom.xml | 6 ++- .../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 9 ++-- apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 5 ++- .../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 6 ++- .../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 5 ++- .../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 5 ++- .../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 5 ++- apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 5 ++- apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 6 ++- .../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 6 ++- .../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 5 ++- apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 5 ++- .../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 5 ++- .../nutz-plugins/http-1.x-plugin/pom.xml | 5 ++- .../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 5 ++- apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 5 ++- .../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 6 ++- apm-sniffer/apm-sdk-plugin/pom.xml | 20 +++++---- .../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 5 ++- .../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 6 ++- .../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 6 ++- .../apm-sdk-plugin/servicecomb-plugin/pom.xml | 5 ++- .../servicecomb-java-chassis-0.x-plugin/pom.xml | 8 ++-- .../sharding-jdbc-1.5.x-plugin/pom.xml | 6 ++- .../concurrent-util-4.x-plugin/pom.xml | 5 ++- .../spring-plugins/core-patch/pom.xml | 6 ++- .../mvc-annotation-3.x-plugin/pom.xml | 5 ++- .../mvc-annotation-4.x-plugin/pom.xml | 5 ++- .../spring-plugins/mvc-annotation-commons/pom.xml | 5 ++- apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 5 ++- .../spring-plugins/resttemplate-4.x-plugin/pom.xml | 5 ++- .../spring-cloud/netflix-plugins/pom.xml | 5 ++- .../spring-cloud-feign-1.x-plugin/pom.xml | 5 ++- .../spring-plugins/spring-cloud/pom.xml | 5 ++- .../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 6 ++- .../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 5 ++- .../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 5 ++- .../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 6 ++- apm-sniffer/apm-test-tools/pom.xml | 5 ++- .../apm-toolkit-log4j-1.x-activation/pom.xml | 6 ++- .../apm-toolkit-log4j-2.x-activation/pom.xml | 6 ++- .../apm-toolkit-logback-1.x-activation/pom.xml | 6 ++- .../apm-toolkit-opentracing-activation/pom.xml | 6 ++- .../apm-toolkit-trace-activation/pom.xml | 6 ++- apm-sniffer/apm-toolkit-activation/pom.xml | 16 ++++--- .../optional-spring-plugins/pom.xml | 6 ++- .../spring-annotation-plugin/pom.xml | 6 ++- apm-sniffer/optional-plugins/pom.xml | 19 ++++++--- apm-sniffer/pom.xml | 6 ++- apm-webapp/pom.xml | 6 +-- docs/README.md | 1 + docs/en/How-to-release.md | 2 + pom.xml | 4 +- 145 files changed, 617 insertions(+), 309 deletions(-) diff --cc apm-dist/pom.xml index 61a97de,3746a87..b42a18d --- a/apm-dist/pom.xml +++ b/apm-dist/pom.xml @@@ -97,5 -78,5 +97,4 @@@ </plugin> </plugins> </build> -- </project> diff --cc apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml index f955e63,bc7b8be..0d53300 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml @@@ -1,23 -1,6 +1,24 @@@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You 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. + ~ + --> + - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + <project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>apm-sdk-plugin</artifactId> @@@ -28,7 -11,7 +29,6 @@@ <artifactId>apm-hystrix-1.x-plugin</artifactId> -- <dependencies> <dependency> <groupId>com.netflix.hystrix</groupId> @@@ -37,5 -20,5 +37,4 @@@ <scope>provided</scope> </dependency> </dependencies> -- --</project> ++</project> diff --cc apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml index accf9ed,3d206c6..d028e2b --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml @@@ -1,23 -1,6 +1,24 @@@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You 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. + ~ + --> + - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + <project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>apm-sdk-plugin</artifactId> diff --cc apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml index 064121f,2d12fba..55de8b05 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml @@@ -1,23 -1,6 +1,24 @@@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You 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. + ~ + --> + - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + <project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>servicecomb-plugin</artifactId> @@@ -31,8 -14,8 +32,7 @@@ <name>servicecomb-java-chassis-0.x-plugin</name> <url>http://maven.apache.org</url> -- -- ++ <dependencies> <dependency> <groupId>io.servicecomb</groupId> diff --cc apm-webapp/pom.xml index 5792d09,b0dd76f..2ccf6cf --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@@ -1,23 -1,6 +1,24 @@@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You 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. + ~ + --> + - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + <project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>apm</artifactId> @@@ -170,5 -153,5 +171,4 @@@ </plugin> </plugins> </build> -- </project> -- To stop receiving notification emails like this one, please contact [email protected].
