diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml index b1a5d5592..8245906c4 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + agent-grpc org.apache.skywalking diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml index ac396ad7d..3ded0e2ec 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + agent-grpc org.apache.skywalking diff --git a/apm-collector/apm-collector-agent/agent-grpc/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/pom.xml index ea4d49851..567359aec 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-agent org.apache.skywalking @@ -31,5 +32,4 @@ agent-grpc-define agent-grpc-provider - \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml index 76677a941..449cb67b9 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + agent-jetty org.apache.skywalking @@ -26,6 +27,4 @@ 4.0.0 agent-jetty-define - - \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml index 5157dea59..f2325a24c 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + agent-jetty org.apache.skywalking diff --git a/apm-collector/apm-collector-agent/agent-jetty/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/pom.xml index fcdd125f9..cc3268cff 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-agent org.apache.skywalking @@ -31,6 +32,4 @@ agent-jetty-define agent-jetty-provider - - \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/pom.xml b/apm-collector/apm-collector-agent/pom.xml index e40d08c42..1f943908f 100644 --- a/apm-collector/apm-collector-agent/pom.xml +++ b/apm-collector/apm-collector-agent/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml index c676001de..64392c1fa 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-alarm org.apache.skywalking @@ -27,5 +28,4 @@ alarm-define jar - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml index 0594d7736..03064afe6 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-alarm org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml index 861c72f98..185a42b17 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-analysis org.apache.skywalking @@ -31,6 +32,4 @@ alarm-define alarm-provider - - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml index 6ce2cb424..fbf265b2a 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-baseline org.apache.skywalking @@ -27,5 +28,4 @@ baseline-computing-define jar - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml index 307f5c366..a2f896cc8 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-baseline org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml index e6882016e..60a135ca6 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-analysis org.apache.skywalking @@ -31,6 +32,4 @@ baseline-computing-define baseline-computing-provider - - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml index 2f353ce64..fd977cd03 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-jvm org.apache.skywalking @@ -26,6 +27,4 @@ 4.0.0 jvm-define - - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml index 5fce584c9..ebdf5664f 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-jvm org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml b/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml index 7290fbfaf..420ac84d4 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-jvm/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-analysis org.apache.skywalking @@ -31,6 +32,4 @@ jvm-define jvm-provider - - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml index 955d4c73d..4fd6014da 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-metric org.apache.skywalking @@ -27,5 +28,4 @@ metric-define jar - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml index 4cf49ddf7..7237a1a4b 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-metric org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-metric/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/pom.xml index 74a9e47c3..e992f76c1 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-metric/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-analysis org.apache.skywalking @@ -31,6 +32,4 @@ metric-define metric-provider - - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-register/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/pom.xml index ccb142eb0..54014d23c 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-analysis org.apache.skywalking @@ -31,6 +32,4 @@ register-define register-provider - - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml index 54d793dd2..597b0c093 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-register org.apache.skywalking @@ -26,6 +27,4 @@ 4.0.0 register-define - - \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml index 9c6316421..4c42088df 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-register org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml b/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml index 0ccbbcd2d..1fbb44471 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-analysis org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml index cfb14af89..9c27dc901 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-segment-parser org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml index 7dc9fa14c..950526a90 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + analysis-segment-parser org.apache.skywalking diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml b/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml index dfde41f89..805e09fc5 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-analysis org.apache.skywalking @@ -37,7 +38,7 @@ org.apache.skywalking apm-datacarrier - 5.0.0-beta-SNAPSHOT + ${project.version} \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/pom.xml b/apm-collector/apm-collector-analysis/pom.xml index d4f058ab3..11b642348 100644 --- a/apm-collector/apm-collector-analysis/pom.xml +++ b/apm-collector/apm-collector-analysis/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index d3a2ac1d5..61af52172 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -37,7 +38,6 @@ org.yaml snakeyaml - 1.18 org.apache.skywalking @@ -235,4 +235,4 @@ - + \ No newline at end of file diff --git a/apm-collector/apm-collector-cache/collector-cache-define/pom.xml b/apm-collector/apm-collector-cache/collector-cache-define/pom.xml index 0f7727088..e5a2bdc38 100644 --- a/apm-collector/apm-collector-cache/collector-cache-define/pom.xml +++ b/apm-collector/apm-collector-cache/collector-cache-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-cache org.apache.skywalking @@ -27,5 +28,4 @@ collector-cache-define jar - - + \ No newline at end of file diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml b/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml index 2727d4e0b..1a44ecb3c 100644 --- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml +++ b/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-cache org.apache.skywalking @@ -37,7 +38,6 @@ com.google.guava guava - 19.0 - + \ No newline at end of file diff --git a/apm-collector/apm-collector-cache/pom.xml b/apm-collector/apm-collector-cache/pom.xml index 2cad07a41..3ec6a8278 100644 --- a/apm-collector/apm-collector-cache/pom.xml +++ b/apm-collector/apm-collector-cache/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -44,4 +45,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml index 3de3165aa..328ee262e 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-cluster org.apache.skywalking @@ -27,5 +28,4 @@ collector-cluster-define jar - diff --git a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml index 274899e78..633d7ebbe 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-cluster org.apache.skywalking @@ -35,4 +36,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml index 096bacaf8..35ffe51ac 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-cluster org.apache.skywalking @@ -35,4 +36,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml index 7813cc2ec..ea17a6f6c 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml +++ b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-cluster org.apache.skywalking @@ -40,4 +41,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-cluster/pom.xml b/apm-collector/apm-collector-cluster/pom.xml index f937e160e..0eb2bdd92 100644 --- a/apm-collector/apm-collector-cluster/pom.xml +++ b/apm-collector/apm-collector-cluster/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -46,4 +47,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/client-component/pom.xml b/apm-collector/apm-collector-component/client-component/pom.xml index a77e36b46..99ac8b639 100644 --- a/apm-collector/apm-collector-component/client-component/pom.xml +++ b/apm-collector/apm-collector-component/client-component/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-component org.apache.skywalking @@ -32,17 +33,14 @@ com.h2database h2 - 1.4.196 redis.clients jedis - 2.9.0 org.elasticsearch.client transport - 5.5.0 snakeyaml @@ -81,7 +79,6 @@ org.apache.zookeeper zookeeper - 3.4.10 slf4j-api diff --git a/apm-collector/apm-collector-component/pom.xml b/apm-collector/apm-collector-component/pom.xml index b358cdc11..fb5f7405c 100644 --- a/apm-collector/apm-collector-component/pom.xml +++ b/apm-collector/apm-collector-component/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -39,4 +40,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-component/server-component/pom.xml b/apm-collector/apm-collector-component/server-component/pom.xml index 0ba4dbe80..28cacc2f5 100644 --- a/apm-collector/apm-collector-component/server-component/pom.xml +++ b/apm-collector/apm-collector-component/server-component/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-component org.apache.skywalking @@ -28,10 +29,6 @@ server-component jar - - 9.4.2.v20170220 - - org.apache.skywalking @@ -47,12 +44,10 @@ org.eclipse.jetty jetty-server - ${jetty.version} org.eclipse.jetty jetty-servlet - ${jetty.version} diff --git a/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml b/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml index b2f464485..d0bfd7b64 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml +++ b/apm-collector/apm-collector-configuration/collector-configuration-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-configuration org.apache.skywalking @@ -27,5 +28,4 @@ collector-configuration-define jar - - + \ No newline at end of file diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml b/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml index 6ab79cd7e..57dd1d343 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml +++ b/apm-collector/apm-collector-configuration/collector-configuration-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-configuration org.apache.skywalking diff --git a/apm-collector/apm-collector-configuration/pom.xml b/apm-collector/apm-collector-configuration/pom.xml index 5675ff5e2..23b3dc3eb 100644 --- a/apm-collector/apm-collector-configuration/pom.xml +++ b/apm-collector/apm-collector-configuration/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking diff --git a/apm-collector/apm-collector-core/pom.xml b/apm-collector/apm-collector-core/pom.xml index f2019a28d..50d72c80c 100644 --- a/apm-collector/apm-collector-core/pom.xml +++ b/apm-collector/apm-collector-core/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -32,12 +33,10 @@ com.google.code.gson gson - 2.8.1 joda-time joda-time - 2.9.9 - + \ No newline at end of file diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml index 2f5fa6dfd..a85374d43 100644 --- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml +++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-grpc-manager org.apache.skywalking @@ -27,5 +28,4 @@ collector-grpc-manager-define jar - diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml index 03e09fb63..3af18abef 100644 --- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml +++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-grpc-manager org.apache.skywalking diff --git a/apm-collector/apm-collector-grpc-manager/pom.xml b/apm-collector/apm-collector-grpc-manager/pom.xml index fe70dde8c..00f4c612b 100644 --- a/apm-collector/apm-collector-grpc-manager/pom.xml +++ b/apm-collector/apm-collector-grpc-manager/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -44,4 +45,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-instrument/pom.xml b/apm-collector/apm-collector-instrument/pom.xml index 732c49de7..2d7a5d28a 100644 --- a/apm-collector/apm-collector-instrument/pom.xml +++ b/apm-collector/apm-collector-instrument/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -37,7 +38,6 @@ net.bytebuddy byte-buddy - 1.7.8 @@ -63,7 +63,9 @@ - org.apache.skywalking.apm.collector.instrument.CollectorInstrumentAgent + + org.apache.skywalking.apm.collector.instrument.CollectorInstrumentAgent + diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml index b4cb50af1..9a5bc8462 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml +++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-jetty-manager org.apache.skywalking @@ -27,5 +28,4 @@ collector-jetty-manager-define jar - diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml index b6dfcbf20..27169c820 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml +++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-jetty-manager org.apache.skywalking @@ -35,4 +36,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-jetty-manager/pom.xml b/apm-collector/apm-collector-jetty-manager/pom.xml index 675a25e4c..b9345a061 100644 --- a/apm-collector/apm-collector-jetty-manager/pom.xml +++ b/apm-collector/apm-collector-jetty-manager/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -44,4 +45,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-naming/collector-naming-define/pom.xml b/apm-collector/apm-collector-naming/collector-naming-define/pom.xml index 1fc8a91f0..ce7e8b91c 100644 --- a/apm-collector/apm-collector-naming/collector-naming-define/pom.xml +++ b/apm-collector/apm-collector-naming/collector-naming-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-naming org.apache.skywalking @@ -27,5 +28,4 @@ collector-naming-define jar - - + \ No newline at end of file diff --git a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml index a1a36cd83..dbea1c4ea 100644 --- a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-naming org.apache.skywalking @@ -40,4 +41,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-naming/pom.xml b/apm-collector/apm-collector-naming/pom.xml index e790b52a8..2f208b96b 100644 --- a/apm-collector/apm-collector-naming/pom.xml +++ b/apm-collector/apm-collector-naming/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -49,4 +50,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-remote/collector-remote-define/pom.xml b/apm-collector/apm-collector-remote/collector-remote-define/pom.xml index 6ac09273d..4ad1f9609 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/pom.xml +++ b/apm-collector/apm-collector-remote/collector-remote-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-remote org.apache.skywalking @@ -27,5 +28,4 @@ collector-remote-define jar - - + \ No newline at end of file diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml index ff6c33c32..aff28018a 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml +++ b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-remote org.apache.skywalking diff --git a/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml b/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml index eead3e994..c2f942196 100644 --- a/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml +++ b/apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-remote org.apache.skywalking @@ -35,4 +36,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-remote/pom.xml b/apm-collector/apm-collector-remote/pom.xml index 20f077b12..c85b7e01e 100644 --- a/apm-collector/apm-collector-remote/pom.xml +++ b/apm-collector/apm-collector-remote/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking @@ -55,4 +56,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-storage/collector-storage-define/pom.xml b/apm-collector/apm-collector-storage/collector-storage-define/pom.xml index 759a46296..0142d3bda 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/pom.xml +++ b/apm-collector/apm-collector-storage/collector-storage-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-storage org.apache.skywalking diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml b/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml index 0aa276a7a..f1a97d048 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-storage org.apache.skywalking diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml b/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml index 80d5f84f1..df6899293 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-storage org.apache.skywalking diff --git a/apm-collector/apm-collector-storage/pom.xml b/apm-collector/apm-collector-storage/pom.xml index 3e622c317..4ad541281 100644 --- a/apm-collector/apm-collector-storage/pom.xml +++ b/apm-collector/apm-collector-storage/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking diff --git a/apm-collector/apm-collector-ui/collector-ui-define/pom.xml b/apm-collector/apm-collector-ui/collector-ui-define/pom.xml index ddcf80ea4..d5bf4ab17 100644 --- a/apm-collector/apm-collector-ui/collector-ui-define/pom.xml +++ b/apm-collector/apm-collector-ui/collector-ui-define/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-ui org.apache.skywalking @@ -27,5 +28,4 @@ collector-ui-define jar - diff --git a/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml b/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml index 19d11b7a1..8c2acd9e5 100644 --- a/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml +++ b/apm-collector/apm-collector-ui/collector-ui-graphql/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-ui org.apache.skywalking @@ -32,7 +33,6 @@ com.graphql-java graphql-java-tools - 4.3.0 org.apache.skywalking diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml index de955c364..09d44ad90 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector-ui org.apache.skywalking diff --git a/apm-collector/apm-collector-ui/pom.xml b/apm-collector/apm-collector-ui/pom.xml index 4053440f3..725677151 100644 --- a/apm-collector/apm-collector-ui/pom.xml +++ b/apm-collector/apm-collector-ui/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-collector org.apache.skywalking diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml index 46a27e181..b696c5fdc 100644 --- a/apm-collector/pom.xml +++ b/apm-collector/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm org.apache.skywalking @@ -46,31 +47,43 @@ apm-collector-analysis + + UTF-8 + 1.7.25 + 2.9.0 + 19.0 + 1.18 + 1.7.8 + 4.3.0 + 2.8.1 + 2.9.9 + 9.4.2.v20170220 + 1.4.196 + 2.9.0 + 3.4.10 + 5.5.0 + + org.apache.skywalking apm-util - ${project.version} org.slf4j slf4j-api - 1.7.25 org.slf4j log4j-over-slf4j - 1.7.25 org.apache.logging.log4j log4j-core - 2.9.0 org.apache.logging.log4j log4j-slf4j-impl - 2.9.0 org.apache.logging.log4j @@ -79,4 +92,144 @@ + + + + + org.apache.skywalking + apm-util + ${project.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + com.graphql-java + graphql-java-tools + ${graphql-java-tools.version} + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + + com.google.code.gson + gson + ${gson.version} + + + joda-time + joda-time + ${joda-time.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + com.h2database + h2 + ${h2.version} + + + redis.clients + jedis + ${jedis.version} + + + org.elasticsearch.client + transport + ${elasticsearch.client.version} + + + snakeyaml + org.yaml + + + netty-common + io.netty + + + netty-transport + io.netty + + + netty-codec + io.netty + + + netty-codec-http + io.netty + + + netty-buffer + io.netty + + + netty-handler + io.netty + + + netty-resolver + io.netty + + + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + slf4j-api + org.slf4j + + + slf4j-log4j12 + org.slf4j + + + + + com.google.guava + guava + ${guava.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + + + + +