未验证 提交 df97dc34 编写于 作者: wu-sheng's avatar wu-sheng 提交者: GitHub

Merge branch 'master' into feature/stream-jetty

......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -22,7 +22,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-application-toolkit</artifactId>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cache</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cache</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-cluster</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-component</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-component</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-grpc-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-grpc-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-jetty-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-jetty-manager</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-naming</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-naming</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-queue</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector-remote</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-remote</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-remote</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-storage</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-storage</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-storage</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-stream</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-stream</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-ui</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-collector-ui</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -5,7 +5,7 @@
<parent>
<artifactId>apm-collector</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-agent-core</artifactId>
......
......@@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-agent</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-grpc-1.x-plugin</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-httpClient-4.x-plugin</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-jedis-2.x-plugin</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>jetty-plugins</artifactId>
......
......@@ -22,7 +22,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-mongodb-3.x-plugin</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>nutz-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>nutz-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>nutz-plugins</artifactId>
......
......@@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-sdk-plugin</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -25,7 +25,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-resin-3.x-plugin</artifactId>
......
......@@ -25,7 +25,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-resin-4.x-plugin</artifactId>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>spring-plugins</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>spring-plugins</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>spring-cloud</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>netflix-plugins</artifactId>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>netflix-plugins</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-spring-cloud-feign-1.x-plugin</artifactId>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>spring-plugins</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>spring-cloud</artifactId>
......
......@@ -24,7 +24,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-spymemcached-2.x-plugin</artifactId>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-xmemcached-2.x-plugin</artifactId>
......
......@@ -23,7 +23,7 @@
<parent>
<groupId>org.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<artifactId>apm-test-tools</artifactId>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm-sniffer</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
......
......@@ -23,7 +23,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
version: '2.1'
services:
skywalking-webui:
image: skywalking/skywalking-ui:3.2.4-2017
image: skywalking/skywalking-ui:3.2.5-2017
expose:
- "8080"
ports:
......@@ -15,7 +15,7 @@ services:
- COLLECTOR_SERVERS=skywalking-collector:10800
skywalking-collector:
image: skywalking/skywalking-collector:3.2.4-2017
image: skywalking/skywalking-collector:3.2.5-2017
expose:
- "10800"
- "11800"
......
......@@ -23,7 +23,7 @@
<groupId>org.skywalking</groupId>
<artifactId>apm</artifactId>
<version>3.2.4-2017</version>
<version>3.2.5-2017</version>
<developers>
<developer>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册