From 9b87086d720959f0061914feccb280a958acc805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 30 Apr 2019 12:16:50 +0800 Subject: [PATCH] Move to 6.2 (#2563) * Move submodule plugin. * Always auto-submodule * [maven-release-plugin] prepare release v6.1.0 * [maven-release-plugin] prepare for next development iteration * Change keys location. --- .../apm-toolkit-log4j-1.x/pom.xml | 2 +- .../apm-toolkit-log4j-2.x/pom.xml | 2 +- .../apm-toolkit-logback-1.x/pom.xml | 2 +- .../apm-toolkit-opentracing/pom.xml | 2 +- .../apm-toolkit-trace/pom.xml | 2 +- apm-application-toolkit/pom.xml | 2 +- apm-checkstyle/pom.xml | 3 +- apm-commons/apm-datacarrier/pom.xml | 2 +- apm-commons/apm-util/pom.xml | 5 +- apm-commons/pom.xml | 2 +- apm-dist/pom.xml | 13 ++-- apm-protocol/apm-network/pom.xml | 2 +- apm-protocol/pom.xml | 2 +- apm-sniffer/apm-agent-core/pom.xml | 2 +- apm-sniffer/apm-agent/pom.xml | 2 +- .../activemq-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +- .../dubbo-2.7.x-conflict-patch/pom.xml | 2 +- .../apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml | 2 +- .../dubbo-conflict-patch/pom.xml | 2 +- .../apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +- .../elastic-job-2.x-plugin/pom.xml | 2 +- .../elasticsearch-5.x-plugin/pom.xml | 2 +- .../feign-default-http-9.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +- .../httpClient-4.x-plugin/pom.xml | 2 +- .../httpasyncclient-4.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/jdbc-commons/pom.xml | 2 +- .../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +- .../jetty-client-9.0-plugin/pom.xml | 2 +- .../jetty-client-9.x-plugin/pom.xml | 2 +- .../jetty-server-9.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/jetty-plugin/pom.xml | 2 +- .../apm-sdk-plugin/kafka-v1-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/motan-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 5 +- .../apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 5 +- .../apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 5 +- .../apm-sdk-plugin/mysql-common/pom.xml | 2 +- .../nutz-plugins/http-1.x-plugin/pom.xml | 2 +- .../mvc-annotation-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/nutz-plugins/pom.xml | 2 +- .../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/pom.xml | 2 +- .../postgresql-8.x-plugin/pom.xml | 2 +- .../rabbitmq-5.x-plugin/pom.xml | 2 +- .../redisson-3.x-plugin/pom.xml | 2 +- .../rocketMQ-3.x-plugin/pom.xml | 2 +- .../rocketMQ-4.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +- .../concurrent-util-4.x-plugin/pom.xml | 2 +- .../spring-plugins/core-patch/pom.xml | 2 +- .../mvc-annotation-3.x-plugin/pom.xml | 2 +- .../mvc-annotation-4.x-plugin/pom.xml | 2 +- .../mvc-annotation-5.x-plugin/pom.xml | 2 +- .../mvc-annotation-commons/pom.xml | 2 +- .../apm-sdk-plugin/spring-plugins/pom.xml | 2 +- .../resttemplate-4.x-plugin/pom.xml | 2 +- .../spring-cloud/netflix-plugins/pom.xml | 2 +- .../spring-cloud-feign-1.x-plugin/pom.xml | 2 +- .../spring-plugins/spring-cloud/pom.xml | 2 +- .../spring-plugins/spring-commons/pom.xml | 2 +- .../spring-plugins/webflux-5.x-plugin/pom.xml | 2 +- .../spymemcached-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +- .../tomcat-7.x-8.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/undertow-plugins/pom.xml | 2 +- .../undertow-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/vertx-plugins/pom.xml | 2 +- .../vertx-core-3.x-plugin/pom.xml | 2 +- .../xmemcached-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-test-tools/pom.xml | 2 +- .../apm-toolkit-log4j-1.x-activation/pom.xml | 2 +- .../apm-toolkit-log4j-2.x-activation/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../apm-toolkit-trace-activation/pom.xml | 2 +- apm-sniffer/apm-toolkit-activation/pom.xml | 2 +- .../customize-enhance-plugin/pom.xml | 6 +- .../gson-2.8.x-plugin/pom.xml | 2 +- .../lettuce-5.x-plugin/pom.xml | 2 +- .../optional-spring-plugins/pom.xml | 2 +- .../spring-annotation-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/pom.xml | 2 +- .../trace-ignore-plugin/pom.xml | 2 +- .../zookeeper-3.4.x-plugin/pom.xml | 2 +- apm-sniffer/pom.xml | 2 +- apm-webapp/pom.xml | 2 +- docs/en/guides/How-to-release.md | 6 +- oap-server/exporter/pom.xml | 6 +- oap-server/generate-tool-grammar/pom.xml | 6 +- oap-server/generate-tool/pom.xml | 2 +- oap-server/generated-analysis/pom.xml | 2 +- oap-server/pom.xml | 5 +- oap-server/server-alarm-plugin/pom.xml | 2 +- .../cluster-consul-plugin/pom.xml | 2 +- .../cluster-kubernetes-plugin/pom.xml | 2 +- .../cluster-standalone-plugin/pom.xml | 2 +- .../cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml | 2 +- oap-server/server-core/pom.xml | 2 +- .../server-library/library-buffer/pom.xml | 2 +- .../server-library/library-client/pom.xml | 5 +- .../server-library/library-module/pom.xml | 2 +- .../server-library/library-server/pom.xml | 2 +- .../server-library/library-util/pom.xml | 2 +- oap-server/server-library/pom.xml | 2 +- oap-server/server-query-plugin/pom.xml | 2 +- .../query-graphql-plugin/pom.xml | 2 +- .../envoy-metrics-receiver-plugin/pom.xml | 2 +- .../jaeger-receiver-plugin/pom.xml | 6 +- oap-server/server-receiver-plugin/pom.xml | 2 +- .../receiver-proto/pom.xml | 6 +- .../skywalking-clr-receiver-plugin/pom.xml | 6 +- .../pom.xml | 2 +- .../skywalking-jvm-receiver-plugin/pom.xml | 5 +- .../skywalking-mesh-receiver-plugin/pom.xml | 5 +- .../pom.xml | 5 +- .../skywalking-sharing-server-plugin/pom.xml | 6 +- .../skywalking-trace-receiver-plugin/pom.xml | 5 +- .../zipkin-receiver-plugin/pom.xml | 5 +- oap-server/server-starter/pom.xml | 2 +- oap-server/server-storage-plugin/pom.xml | 2 +- .../storage-elasticsearch-plugin/pom.xml | 2 +- .../storage-jaeger-plugin/pom.xml | 6 +- .../storage-jdbc-hikaricp-plugin/pom.xml | 2 +- .../storage-zipkin-plugin/pom.xml | 6 +- oap-server/server-telemetry/pom.xml | 2 +- .../server-telemetry/telemetry-api/pom.xml | 2 +- .../telemetry-prometheus/pom.xml | 2 +- oap-server/server-testing/pom.xml | 2 +- pom.xml | 61 ++++++++----------- 140 files changed, 191 insertions(+), 233 deletions(-) diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml index 40accf10d..507ee0dcb 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml index b42a001a4..0f2fc0112 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml index 0bddd2977..f68846419 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml index 9db99e7ce..21b29b755 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml +++ b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-trace/pom.xml b/apm-application-toolkit/apm-toolkit-trace/pom.xml index 59364a675..33c8b3ac9 100644 --- a/apm-application-toolkit/apm-toolkit-trace/pom.xml +++ b/apm-application-toolkit/apm-toolkit-trace/pom.xml @@ -20,7 +20,7 @@ apm-application-toolkit org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml index 5c243a9af..8afdc06cf 100644 --- a/apm-application-toolkit/pom.xml +++ b/apm-application-toolkit/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 apm-application-toolkit diff --git a/apm-checkstyle/pom.xml b/apm-checkstyle/pom.xml index 7b19433f0..5466fa054 100644 --- a/apm-checkstyle/pom.xml +++ b/apm-checkstyle/pom.xml @@ -22,7 +22,7 @@ org.apache apache 19 - + 4.0.0 @@ -30,5 +30,4 @@ apm-checkstyle 6.1.0 Module to hold Checkstyle for SkyWalking. - diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml index bb18260e0..fd829be81 100644 --- a/apm-commons/apm-datacarrier/pom.xml +++ b/apm-commons/apm-datacarrier/pom.xml @@ -21,7 +21,7 @@ apm-commons org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml index 7c0a17545..ac4c70c20 100644 --- a/apm-commons/apm-util/pom.xml +++ b/apm-commons/apm-util/pom.xml @@ -16,12 +16,11 @@ ~ --> - + apm-commons org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml index 59264393e..3fdbfbd5c 100644 --- a/apm-commons/pom.xml +++ b/apm-commons/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml index 441628dbd..1a854bc01 100644 --- a/apm-dist/pom.xml +++ b/apm-dist/pom.xml @@ -17,12 +17,11 @@ ~ --> - + apm org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 @@ -105,12 +104,8 @@ - - + + diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index ed5f1de3e..ca2aca680 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -21,7 +21,7 @@ apm-protocol org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml index 5eaf22134..3df576539 100644 --- a/apm-protocol/pom.xml +++ b/apm-protocol/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 5c68d0cc0..0a18a0c24 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-agent-core diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index d243cef77..c9dfe7ab8 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-agent diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml index 09363c3c9..5c1716f3a 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml index 4aa37c532..2cf6c3ad4 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml index e5da82123..a05489418 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml index d9d30c7eb..f698d6198 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml index e1351c8e2..8ab4f71f4 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml index b9a8befbf..b7f596420 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml index d1889402e..ac905d98d 100644 --- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml index 8c9f6c3d3..f98a58360 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml index d858276e2..a38ff5138 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml index 1296acb6e..86538f7c1 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-grpc-1.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml index dc858d054..39745ba68 100755 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml index 35fb23162..059ebc950 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-httpClient-4.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml index 5ae93702d..8fc22c91f 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-httpasyncclient-4.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml index 6ebd071fc..b21fb8753 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml index 92e4d53cf..8fe09501f 100755 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml index efef4650d..383d60330 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-jedis-2.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml index 621e9c678..bcece37aa 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml index 84183a7a0..85cc7b2c6 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml index 6a2e81339..159bb94ad 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml index 7d2af9ae5..a3be40711 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT jetty-plugins diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml index cea2e720b..bdb71b471 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml index 53c62874b..f2b882837 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml index 1ff6c43f1..e857b6aed 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-mongodb-3.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml index f0088e9eb..4329f3e37 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml index 859dd3689..8152ac2db 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml @@ -16,12 +16,11 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml index fe2220d16..4085da0bc 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml @@ -16,12 +16,11 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml index 611c63f78..a8d020c5b 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml @@ -16,12 +16,11 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml index 88109127c..b04310694 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml index 803484af4..3890f84f1 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml index f665296b2..ccb5c8f4c 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml index 55dd64334..f3d4f564c 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT nutz-plugins diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml index 4afa853a0..884477fe1 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 98a3227ec..ff5904e88 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sniffer - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-sdk-plugin diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml index 697137cb4..8b7a28169 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml index 1b3028ad2..65973eb04 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml index e4826720e..3dbd498d6 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-redisson-3.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml index 20052aad0..a74b390f1 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml index 246dd4972..d1fbf90f4 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml index ed3f90210..e5eee2822 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git 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 index 8143b3eb2..91681c979 100644 --- 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 @@ -21,7 +21,7 @@ servicecomb-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml index ef658ce06..cf296dd7e 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml @@ -21,7 +21,7 @@ servicecomb-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml index 2332b45fc..ec75e1b27 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml index c94607156..b73a5e549 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml index 03eadd928..f031e3ca5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml index 72bda4b71..f1116fb50 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml index a4370ec98..70332d196 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml index c55869944..1cfa80144 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml index 6158f0826..d04eecd78 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml @@ -19,7 +19,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml index af8fa6597..eae34d77b 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml index 4c1386703..070a2fc8f 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT spring-plugins diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml index 6f46194e1..04df4ab60 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml index ca97a6cfe..55d6e9c31 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking spring-cloud - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT netflix-plugins diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml index 31f3434fe..f3690485b 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking netflix-plugins - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-spring-cloud-feign-1.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml index c47b282a6..b6eb7a718 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking spring-plugins - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT spring-cloud diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml index 975e2021c..1b81157fc 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml index cb3dba7e3..c38a4a1e1 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/webflux-5.x-plugin/pom.xml @@ -19,7 +19,7 @@ spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml index 67a78f795..e2a4a5fb7 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-spymemcached-2.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml index 03c75b883..22ede9d2f 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index 585d1a2cf..46311d5d2 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml index 2ae511d97..c8435c3bb 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT undertow-plugins diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml index cfec0be0b..89798ca0b 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml @@ -20,7 +20,7 @@ undertow-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml index f6153f4c7..ab868b20c 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT vertx-plugins diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml index bdb5b7fee..d5984a1d5 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml @@ -20,7 +20,7 @@ vertx-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml index 6838fa0d4..97ae43c8d 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-xmemcached-2.x-plugin diff --git a/apm-sniffer/apm-test-tools/pom.xml b/apm-sniffer/apm-test-tools/pom.xml index 93fa09540..b36f40dfd 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-test-tools diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml index 05b8ee4a5..1466b6f99 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml index 7b127d5b5..c20dd59f5 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml index 3b3d7403f..7147c5f9e 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml index 699db4ac8..fee587bde 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml index 9ba74178d..2a118ed32 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index 6af260a94..4360493bd 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml index 197bb855e..ad3510132 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + org.apache.skywalking optional-plugins - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml index a94dc935b..e887be1d5 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-gson-2.x-plugin diff --git a/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml b/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml index 1ad945103..8cb746340 100644 --- a/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-lettuce-5.x-plugin diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml index 0b05dede0..49dc230eb 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml @@ -21,7 +21,7 @@ optional-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml index 243a50214..8514769e7 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml @@ -21,7 +21,7 @@ optional-spring-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 jar diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index 4140e6fe5..99b399d99 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml index 512d5d795..ba6a1f497 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml @@ -20,7 +20,7 @@ optional-plugins org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml index 92841ea4e..54e4e1810 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking optional-plugins - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT apm-zookeeper-3.4.x-plugin diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml index a464a3990..ee568dae9 100644 --- a/apm-sniffer/pom.xml +++ b/apm-sniffer/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index adc0e5dd1..f487c43e1 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index d39ab593c..aa99c5f81 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -46,7 +46,7 @@ This step is only for test, if your env is set right, don't need to check every ## Prepare the release ``` ./mvnw release:clean -./mvnw release:prepare -DautoVersionSubmodules=true -Pauto-submodule +./mvnw release:prepare -DautoVersionSubmodules=true ``` - Set version number as x.y.z, and tag as **v**x.y.z (version tag must start with **v**, you will find the purpose in next step.) @@ -56,7 +56,7 @@ but just failure. Run `gpg --sign xxx` to any file could remember the password f ## Stage the release ``` -./mvnw release:perform -DskipTests -Pauto-submodule +./mvnw release:perform -DskipTests ``` - The release will automatically be inserted into a temporary staging repository for you. @@ -198,7 +198,7 @@ Release CommitID : Keys to verify the Release Candidate : - * http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x2EF5026E70A55777 corresponding to pengys@apache.org + * https://dist.apache.org/repos/dist/release/skywalking/KEYS Guide to build the release from source : diff --git a/oap-server/exporter/pom.xml b/oap-server/exporter/pom.xml index d7a13acc4..aa21e4b7e 100644 --- a/oap-server/exporter/pom.xml +++ b/oap-server/exporter/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/generate-tool-grammar/pom.xml b/oap-server/generate-tool-grammar/pom.xml index 72a35377b..bec2beb66 100644 --- a/oap-server/generate-tool-grammar/pom.xml +++ b/oap-server/generate-tool-grammar/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/generate-tool/pom.xml b/oap-server/generate-tool/pom.xml index 538c296e8..2fa53a92c 100644 --- a/oap-server/generate-tool/pom.xml +++ b/oap-server/generate-tool/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/generated-analysis/pom.xml b/oap-server/generated-analysis/pom.xml index 4cf7c833e..2f303c343 100644 --- a/oap-server/generated-analysis/pom.xml +++ b/oap-server/generated-analysis/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/pom.xml b/oap-server/pom.xml index 07e9640d5..db5bbe1cb 100644 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -17,12 +17,11 @@ ~ --> - + apm org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml index fb921399f..abfff126a 100644 --- a/oap-server/server-alarm-plugin/pom.xml +++ b/oap-server/server-alarm-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml index 02d1f01d0..d68da9ddf 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml index af12c9275..e5e2a69fb 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml index 53f148486..d49d6cfd0 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml @@ -21,7 +21,7 @@ server-cluster-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml index 58c351004..7dccd3669 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking server-cluster-plugin - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/pom.xml b/oap-server/server-cluster-plugin/pom.xml index 2383de21e..153015a17 100644 --- a/oap-server/server-cluster-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml index c6a5742e6..a66eba2d8 100644 --- a/oap-server/server-core/pom.xml +++ b/oap-server/server-core/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-buffer/pom.xml b/oap-server/server-library/library-buffer/pom.xml index d5cbd60a6..d3a2583d6 100644 --- a/oap-server/server-library/library-buffer/pom.xml +++ b/oap-server/server-library/library-buffer/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-client/pom.xml b/oap-server/server-library/library-client/pom.xml index 0e6955adf..ed426d87f 100644 --- a/oap-server/server-library/library-client/pom.xml +++ b/oap-server/server-library/library-client/pom.xml @@ -17,12 +17,11 @@ ~ --> - + server-library org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-module/pom.xml b/oap-server/server-library/library-module/pom.xml index ac2057327..4b1b3ed0d 100644 --- a/oap-server/server-library/library-module/pom.xml +++ b/oap-server/server-library/library-module/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-server/pom.xml b/oap-server/server-library/library-server/pom.xml index c5201afe9..25c994384 100644 --- a/oap-server/server-library/library-server/pom.xml +++ b/oap-server/server-library/library-server/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-util/pom.xml b/oap-server/server-library/library-util/pom.xml index 7609f1903..922690e1c 100644 --- a/oap-server/server-library/library-util/pom.xml +++ b/oap-server/server-library/library-util/pom.xml @@ -21,7 +21,7 @@ server-library org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/pom.xml b/oap-server/server-library/pom.xml index e3901dc3d..15de336b9 100644 --- a/oap-server/server-library/pom.xml +++ b/oap-server/server-library/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-query-plugin/pom.xml b/oap-server/server-query-plugin/pom.xml index f4758b2a2..b24ef1eee 100644 --- a/oap-server/server-query-plugin/pom.xml +++ b/oap-server/server-query-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml index 9f1411c77..85ead062d 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml +++ b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml @@ -21,7 +21,7 @@ server-query-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml index aa8d8c6db..0b665dbd3 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml index 05e6c8d37..7782a8b84 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/pom.xml index 0bd27d7c1..48483ac93 100644 --- a/oap-server/server-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/receiver-proto/pom.xml b/oap-server/server-receiver-plugin/receiver-proto/pom.xml index 37587649c..da2bcb8d7 100644 --- a/oap-server/server-receiver-plugin/receiver-proto/pom.xml +++ b/oap-server/server-receiver-plugin/receiver-proto/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml index b32d1d240..f17e99090 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml index c4edf3f27..ff20d9b72 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml index 7959d1976..9ed2f307f 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml @@ -17,12 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml index 501270ed9..6679e4189 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml @@ -17,12 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml index 9a1d1604d..76f821300 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml @@ -17,12 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml index 4c9882846..29304348a 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml index 9e0a5b7f8..d778df9b4 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml @@ -17,12 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml index a332f7378..aae84568d 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml @@ -17,12 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index 2c567e159..e7d91a53c 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/pom.xml b/oap-server/server-storage-plugin/pom.xml index 27867ac7c..cab8e4947 100644 --- a/oap-server/server-storage-plugin/pom.xml +++ b/oap-server/server-storage-plugin/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml index 268411b67..8fae6ffa2 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml index 93975e941..7e53f3cd9 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-storage-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml index 513faffd7..32331ecdd 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml @@ -21,7 +21,7 @@ server-storage-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml index 61d313b8a..bb414e131 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-storage-plugin org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-telemetry/pom.xml b/oap-server/server-telemetry/pom.xml index 048d168da..3de21b514 100644 --- a/oap-server/server-telemetry/pom.xml +++ b/oap-server/server-telemetry/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-telemetry/telemetry-api/pom.xml b/oap-server/server-telemetry/telemetry-api/pom.xml index 00386027d..bccec40d7 100644 --- a/oap-server/server-telemetry/telemetry-api/pom.xml +++ b/oap-server/server-telemetry/telemetry-api/pom.xml @@ -21,7 +21,7 @@ server-telemetry org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-telemetry/telemetry-prometheus/pom.xml b/oap-server/server-telemetry/telemetry-prometheus/pom.xml index 52d056351..97aab80ad 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/pom.xml +++ b/oap-server/server-telemetry/telemetry-prometheus/pom.xml @@ -21,7 +21,7 @@ server-telemetry org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/oap-server/server-testing/pom.xml b/oap-server/server-testing/pom.xml index e8a8c3966..5de9ef856 100644 --- a/oap-server/server-testing/pom.xml +++ b/oap-server/server-testing/pom.xml @@ -21,7 +21,7 @@ oap-server org.apache.skywalking - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index d8bc1b0b6..35096f25a 100644 --- a/pom.xml +++ b/pom.xml @@ -17,19 +17,18 @@ ~ --> - + 4.0.0 org.apache.skywalking apm - 6.1.0-SNAPSHOT + 6.2.0-SNAPSHOT org.apache apache 21 - + @@ -215,31 +214,6 @@ - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - git submodule update - initialize - false - - git - - submodule - update - --init - --recursive - - - - exec - - - - - io.takari @@ -277,6 +251,30 @@ + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + git submodule update + initialize + false + + git + + submodule + update + --init + --recursive + + + + exec + + + + maven-enforcer-plugin ${maven-enforcer-plugin.version} @@ -416,11 +414,6 @@ - - org.codehaus.mojo - versions-maven-plugin - ${versions-maven-plugin.version} - org.eluder.coveralls coveralls-maven-plugin