This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch oap-alarm in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 537a7a732e2510e9ef8779959a6f121e952dacf6 Author: Gao Hongtao <[email protected]> AuthorDate: Mon Feb 10 11:08:13 2020 +0800 Add trace log * Trace alarm rule reader * Trace the process of running alarm rule, especailly the moving of window * Add toString method to relevant class for tracing --- .../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-application-toolkit/apm-toolkit-trace/pom.xml | 2 +- apm-application-toolkit/pom.xml | 2 +- apm-commons/apm-datacarrier/pom.xml | 2 +- apm-commons/apm-util/pom.xml | 2 +- apm-commons/pom.xml | 2 +- apm-dist-es7/pom.xml | 2 +- apm-dist/pom.xml | 2 +- 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 +- .../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml | 2 +- .../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +- .../cassandra-java-driver-3.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 +- .../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +- .../apm-sdk-plugin/ehcache-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +- .../elasticsearch-5.x-plugin/pom.xml | 2 +- .../elasticsearch-6.x-plugin/pom.xml | 2 +- .../feign-default-http-9.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +- .../httpasyncclient-4.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/httpclient-3.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +- .../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +- .../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 2 +- .../apm-sdk-plugin/lettuce-5.x-plugin/pom.xml | 2 +- .../light4j-plugins/light4j-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml | 2 +- .../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml | 2 +- .../apm-sdk-plugin/netty-socketio-plugin/pom.xml | 2 +- .../nutz-plugins/http-1.x-plugin/pom.xml | 2 +- .../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +- .../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/pom.xml | 2 +- .../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml | 2 +- .../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml | 2 +- .../resteasy-server-3.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +- .../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +- .../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +- .../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +- .../sharding-sphere-3.x-plugin/pom.xml | 2 +- .../sharding-sphere-4.x-RC3-plugin/pom.xml | 2 +- .../sharding-sphere-4.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +- .../apm-sdk-plugin/solrj-7.x-plugin/pom.xml | 2 +- .../spring-plugins/async-annotation-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 +- .../spring-plugins/mvc-annotation-commons/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +- .../spring-plugins/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-webflux-5.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/undertow-plugins/pom.xml | 2 +- .../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +- apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml | 2 +- .../vertx-plugins/vertx-core-3.x-plugin/pom.xml | 2 +- .../apm-sdk-plugin/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 +- .../apm-toolkit-logback-1.x-activation/pom.xml | 2 +- .../apm-toolkit-opentracing-activation/pom.xml | 2 +- .../apm-toolkit-trace-activation/pom.xml | 2 +- apm-sniffer/apm-toolkit-activation/pom.xml | 2 +- .../bootstrap-plugins/jdk-http-plugin/pom.xml | 2 +- .../bootstrap-plugins/jdk-threading-plugin/pom.xml | 2 +- apm-sniffer/bootstrap-plugins/pom.xml | 2 +- .../customize-enhance-plugin/pom.xml | 2 +- .../optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +- .../kotlin-coroutine-plugin/pom.xml | 2 +- .../gateway-2.1.x-plugin/pom.xml | 2 +- .../optional-spring-cloud/pom.xml | 2 +- .../optional-spring-plugins/pom.xml | 2 +- .../spring-annotation-plugin/pom.xml | 2 +- .../spring-tx-plugin/pom.xml | 2 +- apm-sniffer/optional-plugins/pom.xml | 2 +- .../optional-plugins/trace-ignore-plugin/pom.xml | 2 +- .../zookeeper-3.4.x-plugin/pom.xml | 2 +- apm-sniffer/pom.xml | 2 +- apm-webapp/pom.xml | 2 +- oap-server/exporter/pom.xml | 2 +- oap-server/oal-grammar/pom.xml | 2 +- oap-server/oal-rt/pom.xml | 2 +- oap-server/pom.xml | 2 +- oap-server/server-alarm-plugin/pom.xml | 7 ++- .../oap/server/core/alarm/provider/AlarmRule.java | 2 + .../core/alarm/provider/AlarmRulesWatcher.java | 3 + .../oap/server/core/alarm/provider/Rules.java | 1 + .../server/core/alarm/provider/RunningRule.java | 67 ++++++++++++++++++++++ .../src/test/resources/log4j2-test.xml | 32 ++++++----- oap-server/server-bootstrap/pom.xml | 2 +- .../cluster-consul-plugin/pom.xml | 2 +- .../cluster-etcd-plugin/pom.xml | 2 +- .../cluster-kubernetes-plugin/pom.xml | 2 +- .../cluster-nacos-plugin/pom.xml | 2 +- .../cluster-standalone-plugin/pom.xml | 2 +- .../cluster-zookeeper-plugin/pom.xml | 2 +- oap-server/server-cluster-plugin/pom.xml | 2 +- .../server-configuration/configuration-api/pom.xml | 2 +- .../configuration-apollo/pom.xml | 2 +- .../configuration-consul/pom.xml | 2 +- .../configuration-etcd/pom.xml | 2 +- .../configuration-nacos/pom.xml | 2 +- .../configuration-zookeeper/pom.xml | 2 +- .../grpc-configuration-sync/pom.xml | 2 +- oap-server/server-configuration/pom.xml | 2 +- oap-server/server-core/pom.xml | 2 +- oap-server/server-library/library-buffer/pom.xml | 2 +- oap-server/server-library/library-client/pom.xml | 2 +- oap-server/server-library/library-module/pom.xml | 2 +- oap-server/server-library/library-server/pom.xml | 2 +- oap-server/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 | 2 +- oap-server/server-receiver-plugin/pom.xml | 2 +- .../server-receiver-plugin/receiver-proto/pom.xml | 2 +- .../skywalking-clr-receiver-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../skywalking-jvm-receiver-plugin/pom.xml | 2 +- .../skywalking-mesh-receiver-plugin/pom.xml | 2 +- .../skywalking-profile-receiver-plugin/pom.xml | 2 +- .../skywalking-register-receiver-plugin/pom.xml | 2 +- .../skywalking-sharing-server-plugin/pom.xml | 2 +- .../skywalking-so11y-receiver-plugin/pom.xml | 2 +- .../skywalking-trace-receiver-plugin/pom.xml | 2 +- .../zipkin-receiver-plugin/pom.xml | 2 +- oap-server/server-starter-es7/pom.xml | 2 +- oap-server/server-starter/pom.xml | 2 +- oap-server/server-storage-plugin/pom.xml | 2 +- .../storage-elasticsearch-plugin/pom.xml | 2 +- .../storage-elasticsearch7-plugin/pom.xml | 2 +- .../storage-jaeger-plugin/pom.xml | 2 +- .../storage-jdbc-hikaricp-plugin/pom.xml | 2 +- .../storage-zipkin-plugin/pom.xml | 2 +- oap-server/server-telemetry/pom.xml | 2 +- oap-server/server-telemetry/telemetry-api/pom.xml | 2 +- .../server-telemetry/telemetry-prometheus/pom.xml | 2 +- .../server-telemetry/telemetry-so11y/pom.xml | 2 +- oap-server/server-testing/pom.xml | 2 +- pom.xml | 2 +- 185 files changed, 275 insertions(+), 195 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 8ce04b9..e59e37c 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 @@ <parent> <artifactId>apm-application-toolkit</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 2e06674..7bae237 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 @@ <parent> <artifactId>apm-application-toolkit</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 a55d679..3827ebb 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 @@ <parent> <artifactId>apm-application-toolkit</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml index 260402f..a80512f 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml +++ b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-application-toolkit</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-application-toolkit/apm-toolkit-trace/pom.xml b/apm-application-toolkit/apm-toolkit-trace/pom.xml index a31514e..d6ae91c 100644 --- a/apm-application-toolkit/apm-toolkit-trace/pom.xml +++ b/apm-application-toolkit/apm-toolkit-trace/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm-application-toolkit</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml index 653acc5..7ca6c55 100644 --- a/apm-application-toolkit/pom.xml +++ b/apm-application-toolkit/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>apm-application-toolkit</artifactId> diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml index ad4df7d..909c562 100644 --- a/apm-commons/apm-datacarrier/pom.xml +++ b/apm-commons/apm-datacarrier/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-commons</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml index dec8785..41967ff 100644 --- a/apm-commons/apm-util/pom.xml +++ b/apm-commons/apm-util/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm-commons</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml index a2aba1e..5c0330e 100644 --- a/apm-commons/pom.xml +++ b/apm-commons/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-dist-es7/pom.xml b/apm-dist-es7/pom.xml index fd8ec1f..b505db5 100644 --- a/apm-dist-es7/pom.xml +++ b/apm-dist-es7/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml index 51456e2..385ef17 100644 --- a/apm-dist/pom.xml +++ b/apm-dist/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index 1c18df6..3221a1d 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-protocol</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml index 6f44cee..367b575 100644 --- a/apm-protocol/pom.xml +++ b/apm-protocol/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 56f0204..8640315 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sniffer</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-agent-core</artifactId> diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index 835f2fe..8de003d 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sniffer</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-agent</artifactId> 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 115d6b4..279b1bc 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml index 7d04baf..6e38603 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml index 282c6cb..53f66ad 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml index af041d5..632e255 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 1098200..0160b01 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml index 0a8d0ed..790c890 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 1672264..9bcac25 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 20f6bf1..cbd85c4 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 a1d9023..17c475b 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml index 2761752..41fd672 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml index f06af42..ec59f19 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 5336c2f..cde6d10 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 8c3ea8c..402b811 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml index 307f532..c17ac3f 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 0af2eb9..64befcd 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 29084b9..0f84bd7 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-grpc-1.x-plugin</artifactId> 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 81210f5..4217375 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 93ef5fe..ececf05 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-httpClient-4.x-plugin</artifactId> 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 9673907..0929c2f 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-httpasyncclient-4.x-plugin</artifactId> diff --git a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/pom.xml index fcedc9b..9ac2c05 100644 --- a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-httpclient-3.x-plugin</artifactId> 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 fee34e4..40702d1 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml index 601d34e..9d63681 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 a61c4e8..b0de61c 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-jedis-2.x-plugin</artifactId> 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 5a71257..59b71bb 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 @@ <parent> <artifactId>jetty-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 2a61287..0c90d36 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 @@ <parent> <artifactId>jetty-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 a957041..1479a47 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 @@ <parent> <artifactId>jetty-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml index 3741162..fb2e615 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>jetty-plugins</artifactId> diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml index fa525df..5a1d822 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml index 8ab33c3..a232f38 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-lettuce-5.x-plugin</artifactId> diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml index 91c4b3a..571636f 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>light4j-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml index f7e93f6..99b8372 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>light4j-plugins</artifactId> 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 c5fb3ed..8228710 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 c1f0e82..1d7c84a 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-mongodb-3.x-plugin</artifactId> diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml index 62deada..16e8a7c 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 61ef6ba..6ee0f0c 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 @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 a97e533..6989958 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 @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 be24527..ea90a42 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 @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml index 197e9ae..cf58662 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml index 62022f3..a269921 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 0d2d91a..e395911 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 @@ <parent> <artifactId>nutz-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 272240d..a29e038 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 @@ <parent> <artifactId>nutz-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml index 2f380f0..7f234fd 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>nutz-plugins</artifactId> 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 7948ac5..7a7b467 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml index 000d12a..c8d40a8 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-play-2.x-plugin</artifactId> diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index fd720ac..0ff6868 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sniffer</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-sdk-plugin</artifactId> 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 4694acf..138954a 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml index c289236..620b888 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 4347355..5a0654a 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 d9dc82b..1df2e35 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-redisson-3.x-plugin</artifactId> diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml index 396a85b..b12d924 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>resteasy-plugin</artifactId> diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml index 76fea74..5eb580e 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>resteasy-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>resteasy-server-3.x-plugin</artifactId> 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 2b0e52b..a64946f 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 ef1005f..82cdacd 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml index 6318578..b7216df 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 fa9f865..8278e4a 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 @@ <parent> <artifactId>servicecomb-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 b69d8af..c23724d 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 @@ <parent> <artifactId>servicecomb-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 cda5df1..bbabb3d 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml index 7a2f7bf..3c71fa2 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml index c460a2f..c23748c 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml index a6959c3..8acb63c 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml index a1f15d9..535a8bd 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml index 4d6fe03..7708a2d 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml index c1f7200..353a33e 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 9aeb955..ed52f22 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 325a81f..f44e241 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 4adfb2c..97d99d9 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 5724cd0..304ccc4 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 48df1d4..967ee57 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 c4514e1..79d000d 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml index b0b0101..dc8a22a 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>spring-plugins</artifactId> 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 79feac1..361cab6 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 a67aed0..120230b 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>spring-cloud</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>netflix-plugins</artifactId> 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 ebd5656..1c146da 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>netflix-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-spring-cloud-feign-1.x-plugin</artifactId> 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 ef3a94d..cffde2a 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>spring-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>spring-cloud</artifactId> 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 119f3ef..f7d08c1 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 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml index 12d7218..46e6c89 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 1614de6..0b1a67e 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-spymemcached-2.x-plugin</artifactId> 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 339afc9..748c7ef 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 e253946..3d4bb14 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 @@ <parent> <artifactId>apm-sdk-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml index 262e370..fb98a6b 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>undertow-plugins</artifactId> 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 3d4e794..1780dac 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 @@ <parent> <artifactId>undertow-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml index 7c1ebe2..b3267e4 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>vertx-plugins</artifactId> 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 6bc9e6a..a713754 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 @@ <parent> <artifactId>vertx-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 4db5691..9aaebf8 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sdk-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-xmemcached-2.x-plugin</artifactId> diff --git a/apm-sniffer/apm-test-tools/pom.xml b/apm-sniffer/apm-test-tools/pom.xml index 7a4eced..71ee1e1 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>apm-sniffer</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-test-tools</artifactId> 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 e938b05..9e5abf8 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 @@ <parent> <artifactId>apm-toolkit-activation</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 9bb7f54..414239e 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 @@ <parent> <artifactId>apm-toolkit-activation</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 16c7ea7..14c0bb8 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 @@ <parent> <artifactId>apm-toolkit-activation</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 b87c31b..9f6f161 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 @@ <parent> <artifactId>apm-toolkit-activation</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 6c6175a..ae444b3 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 @@ <parent> <artifactId>apm-toolkit-activation</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index c565676..e8a88b2 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sniffer</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml index 0e48776..a2d1ae8 100755 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>bootstrap-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml index f4bf2ce..548e6fe 100755 --- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml +++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>bootstrap-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/bootstrap-plugins/pom.xml b/apm-sniffer/bootstrap-plugins/pom.xml index 2fad032..0449f04 100644 --- a/apm-sniffer/bootstrap-plugins/pom.xml +++ b/apm-sniffer/bootstrap-plugins/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sniffer</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml index a10edac..e41d148 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>optional-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 ec1ff0d..8389dd9 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>optional-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-gson-2.x-plugin</artifactId> diff --git a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/pom.xml b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/pom.xml index 07f9ac8..85217cf 100644 --- a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>optional-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-kotlin-coroutine-plugin</artifactId> diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml index 4dee4b9..cbbd9b9 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>optional-spring-cloud</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-spring-cloud-gateway-2.x-plugin</artifactId> diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml index a7f9544..b0dde52 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>optional-spring-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>optional-spring-cloud</artifactId> diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml index 28344d0..c3a36af 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 @@ <parent> <artifactId>optional-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> 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 81b4db4..6e1971d 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 @@ <parent> <artifactId>optional-spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml index 397d27e..df4ccfa 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>optional-spring-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index c2a82e7..a7c62dc 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm-sniffer</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml index e345c1e..ec0c569 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 @@ <parent> <artifactId>optional-plugins</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 697943e..772083b 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>optional-plugins</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <artifactId>apm-zookeeper-3.4.x-plugin</artifactId> diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml index 5506a52..8d156f5 100644 --- a/apm-sniffer/pom.xml +++ b/apm-sniffer/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index 6a45695..b291d8f 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/exporter/pom.xml b/oap-server/exporter/pom.xml index 2469356..2188a95 100644 --- a/oap-server/exporter/pom.xml +++ b/oap-server/exporter/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/oal-grammar/pom.xml b/oap-server/oal-grammar/pom.xml index e9750ee..14f51cd 100755 --- a/oap-server/oal-grammar/pom.xml +++ b/oap-server/oal-grammar/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/oal-rt/pom.xml b/oap-server/oal-rt/pom.xml index 85c4013..163c9e4 100755 --- a/oap-server/oal-rt/pom.xml +++ b/oap-server/oal-rt/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/pom.xml b/oap-server/pom.xml index a60762d..0a1db66 100755 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml index 26e13c7..3bf99f7 100644 --- a/oap-server/server-alarm-plugin/pom.xml +++ b/oap-server/server-alarm-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,6 +37,11 @@ <artifactId>library-util</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-ext</artifactId> + <version>${slf4j.version}</version> + </dependency> </dependencies> diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java index 93f59f0..5b2afd1 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java @@ -27,6 +27,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; /** * @author wusheng @@ -36,6 +37,7 @@ import lombok.Setter; @AllArgsConstructor @Setter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC) +@ToString public class AlarmRule { private String alarmRuleName; diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java index abfecc9..e944377 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java @@ -19,6 +19,7 @@ package org.apache.skywalking.oap.server.core.alarm.provider; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.alarm.AlarmModule; @@ -38,6 +39,7 @@ import java.util.Map; * @author kezhenxu94 * @since 6.5.0 */ +@Slf4j public class AlarmRulesWatcher extends ConfigChangeWatcher { @Getter private volatile Map<String, List<RunningRule>> runningContext; @@ -90,6 +92,7 @@ public class AlarmRulesWatcher extends ConfigChangeWatcher { this.rules = newRules; this.runningContext = newRunningContext; this.alarmRuleRunningRuleMap = newAlarmRuleRunningRuleMap; + log.info("Update alarm rules to {}", rules); } @Override diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java index e7a2e34..0e7e581 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java @@ -23,6 +23,7 @@ import lombok.*; @Setter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC) +@ToString public class Rules { private List<AlarmRule> rules; private List<String> webhooks; diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java index a39b269..0840626 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java @@ -18,6 +18,11 @@ package org.apache.skywalking.oap.server.core.alarm.provider; +import java.util.Arrays; +import java.util.LinkedHashMap; +import lombok.RequiredArgsConstructor; +import lombok.ToString; +import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; import org.apache.skywalking.oap.server.core.alarm.MetaInAlarm; import org.apache.skywalking.oap.server.core.analysis.metrics.*; @@ -39,6 +44,7 @@ import java.util.concurrent.locks.ReentrantLock; * * @author wusheng */ +@Slf4j public class RunningRule { private static DateTimeFormatter TIME_BUCKET_FORMATTER = DateTimeFormat.forPattern("yyyyMMddHHmm"); @@ -85,17 +91,26 @@ public class RunningRule { public void in(MetaInAlarm meta, Metrics metrics) { if (!meta.getMetricsName().equals(metricsName)) { //Don't match rule, exit. + if (log.isTraceEnabled()) { + log.trace("Metric names are inconsistent, {}-{}", meta.getMetricsName(), metricsName); + } return; } if (CollectionUtils.isNotEmpty(includeNames)) { if (!includeNames.contains(meta.getName())) { + if (log.isTraceEnabled()) { + log.trace("{} isn't in the including list {}", meta.getName(), includeNames); + } return; } } if (CollectionUtils.isNotEmpty(excludeNames)) { if (excludeNames.contains(meta.getName())) { + if (log.isTraceEnabled()) { + log.trace("{} is in the excluding list {}", meta.getName(), excludeNames); + } return; } } @@ -114,6 +129,7 @@ public class RunningRule { valueType = MetricsValueType.MULTI_INTS; threshold.setType(MetricsValueType.MULTI_INTS); } else { + log.warn("Unsupported value type {}", valueType); return; } } @@ -204,6 +220,9 @@ public class RunningRule { } finally { lock.unlock(); } + if (log.isTraceEnabled()) { + log.trace("Move window {}", transformValues(values)); + } } public void add(Metrics metrics) { @@ -226,6 +245,9 @@ public class RunningRule { if (minutes >= values.size()) { // too old data // also should happen, but maybe if agent/probe mechanism time is not right. + if (log.isTraceEnabled()) { + log.trace("Timebucket is {}, endTime is {} and value size is {}", timeBucket, this.endTime, values.size()); + } return; } @@ -233,6 +255,9 @@ public class RunningRule { } finally { this.lock.unlock(); } + if (log.isTraceEnabled()) { + log.trace("Add metric {} to window {}", metrics, transformValues(this.values)); + } } public AlarmMessage checkAlarm() { @@ -293,6 +318,9 @@ public class RunningRule { case MULTI_INTS: int[] ivalueArray = ((MultiIntValuesHolder) metrics).getValues(); Integer[] iaexpected = RunningRule.this.threshold.getIntValuesThreshold(); + if (log.isTraceEnabled()) { + log.trace("Value array is {}, expected array is {}", ivalueArray, iaexpected); + } for (int i = 0; i < ivalueArray.length; i++) { ivalue = ivalueArray[i]; Integer iNullableExpected = 0; @@ -303,6 +331,9 @@ public class RunningRule { } } if (op.test(iNullableExpected, ivalue)) { + if (log.isTraceEnabled()) { + log.trace("Matched, expected {}, value {}", iNullableExpected, ivalue); + } matchCount++; break; } @@ -311,6 +342,9 @@ public class RunningRule { } } + if (log.isTraceEnabled()) { + log.trace("Match count is {}, threshold is {}", matchCount, countThreshold); + } // Reach the threshold in current bucket. return matchCount >= countThreshold; } @@ -322,4 +356,37 @@ public class RunningRule { } } } + + private LinkedList<TraceLogMetric> transformValues(final LinkedList<Metrics> values) { + LinkedList<TraceLogMetric> r = new LinkedList<>(); + values.forEach(m -> { + if (m == null) { + r.add(null); + return; + } + switch (valueType) { + case LONG: + r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((LongValueHolder)m).getValue()})); + break; + case INT: + r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((IntValueHolder)m).getValue()})); + break; + case DOUBLE: + r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((DoubleValueHolder)m).getValue()})); + break; + case MULTI_INTS: + int[] iArr = ((MultiIntValuesHolder)m).getValues(); + r.add(new TraceLogMetric(m.getTimeBucket(), Arrays.stream(iArr).boxed().toArray(Number[]::new))); + break; + } + }); + return r; + } + + @RequiredArgsConstructor + @ToString + private static class TraceLogMetric { + private final long timeBucket; + private final Number[] value; + } } diff --git a/apm-protocol/pom.xml b/oap-server/server-alarm-plugin/src/test/resources/log4j2-test.xml similarity index 55% copy from apm-protocol/pom.xml copy to oap-server/server-alarm-plugin/src/test/resources/log4j2-test.xml index 6f44cee..b440b5e 100644 --- a/apm-protocol/pom.xml +++ b/oap-server/server-alarm-plugin/src/test/resources/log4j2-test.xml @@ -17,18 +17,20 @@ ~ --> -<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> - <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>apm-protocol</artifactId> - <packaging>pom</packaging> - - <modules> - <module>apm-network</module> - </modules> -</project> \ No newline at end of file +<Configuration status="INFO"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/> + </Console> + </Appenders> + <Loggers> + <logger name="org.eclipse.jetty" level="INFO"/> + <logger name="org.apache.zookeeper" level="INFO"/> + <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/> + <logger name="io.grpc.netty" level="INFO"/> + <logger name="org.apache.skywalking.oap.server.core.alarm.provider" level="TRACE"/> + <Root level="INFO"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> diff --git a/oap-server/server-bootstrap/pom.xml b/oap-server/server-bootstrap/pom.xml index 6f65538..573a9f2 100644 --- a/oap-server/server-bootstrap/pom.xml +++ b/oap-server/server-bootstrap/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 2e7934f..509cbe4 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 @@ <parent> <artifactId>server-cluster-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml index 0795eda..d55a577 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-cluster-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 f907ef7..865d42e 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 @@ <parent> <artifactId>server-cluster-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml index ff5f3b5..e5232fa 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>server-cluster-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 366e7d1..f68db48 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 @@ <parent> <artifactId>server-cluster-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 3575de8..5223c11 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 @@ <parent> <groupId>org.apache.skywalking</groupId> <artifactId>server-cluster-plugin</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-cluster-plugin/pom.xml b/oap-server/server-cluster-plugin/pom.xml index b2fc168..041380b 100644 --- a/oap-server/server-cluster-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/configuration-api/pom.xml b/oap-server/server-configuration/configuration-api/pom.xml index d470b81..4924dc5 100644 --- a/oap-server/server-configuration/configuration-api/pom.xml +++ b/oap-server/server-configuration/configuration-api/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-configuration</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/configuration-apollo/pom.xml b/oap-server/server-configuration/configuration-apollo/pom.xml index 11b2a49..ac94f0c 100644 --- a/oap-server/server-configuration/configuration-apollo/pom.xml +++ b/oap-server/server-configuration/configuration-apollo/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-configuration</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/configuration-consul/pom.xml b/oap-server/server-configuration/configuration-consul/pom.xml index 55c81ad..1ecb76b 100644 --- a/oap-server/server-configuration/configuration-consul/pom.xml +++ b/oap-server/server-configuration/configuration-consul/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-configuration</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/configuration-etcd/pom.xml b/oap-server/server-configuration/configuration-etcd/pom.xml index b436cde..1631d60 100644 --- a/oap-server/server-configuration/configuration-etcd/pom.xml +++ b/oap-server/server-configuration/configuration-etcd/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>server-configuration</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/configuration-nacos/pom.xml b/oap-server/server-configuration/configuration-nacos/pom.xml index a9dcde8..6214d6e 100644 --- a/oap-server/server-configuration/configuration-nacos/pom.xml +++ b/oap-server/server-configuration/configuration-nacos/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-configuration</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/configuration-zookeeper/pom.xml b/oap-server/server-configuration/configuration-zookeeper/pom.xml index 1d13069..f7cec43 100644 --- a/oap-server/server-configuration/configuration-zookeeper/pom.xml +++ b/oap-server/server-configuration/configuration-zookeeper/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-configuration</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/grpc-configuration-sync/pom.xml b/oap-server/server-configuration/grpc-configuration-sync/pom.xml index 68ae3b4..f509510 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/pom.xml +++ b/oap-server/server-configuration/grpc-configuration-sync/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>server-configuration</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-configuration/pom.xml b/oap-server/server-configuration/pom.xml index faf18c0..1d767b1 100644 --- a/oap-server/server-configuration/pom.xml +++ b/oap-server/server-configuration/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml index 322b249..f79d7f1 100644 --- a/oap-server/server-core/pom.xml +++ b/oap-server/server-core/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-library/library-buffer/pom.xml b/oap-server/server-library/library-buffer/pom.xml index 0e7d003..b4d5e3b 100644 --- a/oap-server/server-library/library-buffer/pom.xml +++ b/oap-server/server-library/library-buffer/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-library</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-library/library-client/pom.xml b/oap-server/server-library/library-client/pom.xml index 5ddc74a..40a2eb8 100755 --- a/oap-server/server-library/library-client/pom.xml +++ b/oap-server/server-library/library-client/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-library</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-library/library-module/pom.xml b/oap-server/server-library/library-module/pom.xml index a4b1a42..c81488e 100644 --- a/oap-server/server-library/library-module/pom.xml +++ b/oap-server/server-library/library-module/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-library</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-library/library-server/pom.xml b/oap-server/server-library/library-server/pom.xml index 62b1350..e943698 100644 --- a/oap-server/server-library/library-server/pom.xml +++ b/oap-server/server-library/library-server/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-library</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-library/library-util/pom.xml b/oap-server/server-library/library-util/pom.xml index e57893a..38ade23 100644 --- a/oap-server/server-library/library-util/pom.xml +++ b/oap-server/server-library/library-util/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-library</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-library/pom.xml b/oap-server/server-library/pom.xml index bc6bac0..47544d7 100644 --- a/oap-server/server-library/pom.xml +++ b/oap-server/server-library/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-query-plugin/pom.xml b/oap-server/server-query-plugin/pom.xml index b3cb6fc..d38227f 100644 --- a/oap-server/server-query-plugin/pom.xml +++ b/oap-server/server-query-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 52f2e51..b1e4c33 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 @@ <parent> <artifactId>server-query-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 39f1d92..6b3808c 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 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 9906438..8009494 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/pom.xml index 20ec1ae..33657f6 100644 --- a/oap-server/server-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-receiver-plugin/receiver-proto/pom.xml b/oap-server/server-receiver-plugin/receiver-proto/pom.xml index 7eabe97..e504e64 100644 --- a/oap-server/server-receiver-plugin/receiver-proto/pom.xml +++ b/oap-server/server-receiver-plugin/receiver-proto/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 61a231e..8739904 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 @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 a3cc2f9..061d019 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 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 42b8d8a..d7f9be7 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 @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 373ed7b..5dafd93 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 @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/pom.xml index 867cff1..2b1e510 100644 --- a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 15916ee..be93d46 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 @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 b898272..3c57564 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 @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml index 1cf1c61..b11af89 100644 --- a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 b9ccf4d..47c15df 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 @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 ef3fcf9..c44b11b 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-receiver-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-starter-es7/pom.xml b/oap-server/server-starter-es7/pom.xml index 7abd1a3..37513e9 100644 --- a/oap-server/server-starter-es7/pom.xml +++ b/oap-server/server-starter-es7/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index 7c8a471..47a1807 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-storage-plugin/pom.xml b/oap-server/server-storage-plugin/pom.xml index e155e86..c5a64f1 100644 --- a/oap-server/server-storage-plugin/pom.xml +++ b/oap-server/server-storage-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 02792d0..e2fb690 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 @@ <parent> <artifactId>server-storage-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml index 99de400..84834c0 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>apm</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> 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 1861378..16b5388 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-storage-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 e0260d9..269e222 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 @@ <parent> <artifactId>server-storage-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 07e0434..a9cce66 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-storage-plugin</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-telemetry/pom.xml b/oap-server/server-telemetry/pom.xml index c6c9304..ea4bd5b 100644 --- a/oap-server/server-telemetry/pom.xml +++ b/oap-server/server-telemetry/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-telemetry/telemetry-api/pom.xml b/oap-server/server-telemetry/telemetry-api/pom.xml index 34947e2..1655a78 100644 --- a/oap-server/server-telemetry/telemetry-api/pom.xml +++ b/oap-server/server-telemetry/telemetry-api/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-telemetry</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-telemetry/telemetry-prometheus/pom.xml b/oap-server/server-telemetry/telemetry-prometheus/pom.xml index cfc7cf5..8b8e37b 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/pom.xml +++ b/oap-server/server-telemetry/telemetry-prometheus/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-telemetry</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-telemetry/telemetry-so11y/pom.xml b/oap-server/server-telemetry/telemetry-so11y/pom.xml index f91dd2f..f3eca87 100644 --- a/oap-server/server-telemetry/telemetry-so11y/pom.xml +++ b/oap-server/server-telemetry/telemetry-so11y/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>server-telemetry</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/oap-server/server-testing/pom.xml b/oap-server/server-testing/pom.xml index 522d07a..cb578a6 100644 --- a/oap-server/server-testing/pom.xml +++ b/oap-server/server-testing/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>oap-server</artifactId> <groupId>org.apache.skywalking</groupId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index baef7d5..23ce627 100755 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <groupId>org.apache.skywalking</groupId> <artifactId>apm</artifactId> - <version>6.6.0.2</version> + <version>7.0.0-SNAPSHOT</version> <parent> <groupId>org.apache</groupId>
