Skip to content

Commit

Permalink
Merge branch 'master' into feature/history-data-delete
Browse files Browse the repository at this point in the history
  • Loading branch information
@wu-sheng
wu-sheng committed Nov 22, 2017
2 parents 38d97bb + 6ad2eca commit 6a5172a
Show file tree
Hide file tree
Showing 112 changed files with 113 additions and 113 deletions.
2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-opentracing/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-trace/pom.xml
View file
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-application-toolkit/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-application-toolkit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent-grpc</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent-grpc</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-grpc/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent-jetty</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent-jetty</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-jetty/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-stream/collector-agent-stream-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent-stream</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent-stream</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-agent-stream/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-baseline/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-boot/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cache/collector-cache-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cache</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cache</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cache/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-cluster/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-component/client-component/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-component</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-component/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-component/server-component/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-component</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-grpc-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-grpc-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-grpc-manager/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-instrument/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-jetty-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-jetty-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-jetty-manager/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-naming/collector-naming-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-naming</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-naming</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-naming/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-collector/apm-collector-queue/collector-queue-define/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.5-2017</version>
<version>3.3.0-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down

0 comments on commit 6a5172a

Please sign in to comment.