diff --git a/apm-dist-es7/pom.xml b/apm-dist-es7/pom.xml
index 3910071e9a6c71c908c32bb14a066186740a30b8..5bf8e40408fc9fcad32d1b8d326274a2d7903d8f 100644
--- a/apm-dist-es7/pom.xml
+++ b/apm-dist-es7/pom.xml
@@ -106,13 +106,13 @@
run
-
+
-
+
-
\ No newline at end of file
+
diff --git a/apm-dist-es7/src/main/assembly/binary-es7.xml b/apm-dist-es7/src/main/assembly/binary-es7.xml
index 060bbd22d34c371d28cdd0900e6901579fff279a..337217b65698ecc430471ed739a257e2b99eda88 100644
--- a/apm-dist-es7/src/main/assembly/binary-es7.xml
+++ b/apm-dist-es7/src/main/assembly/binary-es7.xml
@@ -27,7 +27,7 @@
${project.basedir}/../dist-material/bin
- /bin
+ bin
*.sh
*.bat
@@ -36,7 +36,7 @@
${project.basedir}/../dist-material
- /config
+ config
log4j2.xml
alarm-settings.yml
@@ -44,7 +44,7 @@
${project.basedir}/../dist-material
- /
+
config-examples/*
@@ -68,49 +68,39 @@
lal/*
log-mal-rules/*
- /config
+ config
${project.basedir}/../oap-server/server-starter-es7/target/skywalking-oap-assembly/skywalking-oap/libs
- /oap-libs
+ oap-libs
${project.basedir}/../skywalking-agent
- /agent
+ agent
${project.basedir}/../tools/profile-exporter
- /tools/profile-exporter
-
-
-
-
- ${project.basedir}/../
- /
-
- DISCLAIMER
- CHANGES
-
+ tools/profile-exporter
${project.basedir}/../dist-material/release-docs
- /
+
- /webapp
+ webapp
0644
- /webapp
+ webapp
0644
diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml
index dcae685270c9f58d2f3865c9b862cbc903ae5b0c..17d08a40467aa9f8447f74fc97fce3a8946d1cf6 100644
--- a/apm-dist/pom.xml
+++ b/apm-dist/pom.xml
@@ -106,13 +106,13 @@
run
-
+
-
+
-
\ No newline at end of file
+
diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml
index a81c44daf480886586a50f76750ffaded7a5bd7a..562fe8b11d45d2c765029c1a95f37cf61af52a87 100644
--- a/apm-dist/src/main/assembly/binary.xml
+++ b/apm-dist/src/main/assembly/binary.xml
@@ -27,7 +27,7 @@
${project.basedir}/../dist-material/bin
- /bin
+ bin
*.sh
*.bat
@@ -36,7 +36,7 @@
${project.basedir}/../dist-material
- /config
+ config
log4j2.xml
alarm-settings.yml
@@ -44,7 +44,7 @@
${project.basedir}/../dist-material
- /
+
config-examples/*
@@ -68,49 +68,39 @@
lal/*
log-mal-rules/*
- /config
+ config
${project.basedir}/../oap-server/server-starter/target/skywalking-oap-assembly/skywalking-oap/libs
- /oap-libs
+ oap-libs
${project.basedir}/../skywalking-agent
- /agent
+ agent
${project.basedir}/../tools/profile-exporter
- /tools/profile-exporter
-
-
-
-
- ${project.basedir}/../
- /
-
- DISCLAIMER
- CHANGES
-
+ tools/profile-exporter
${project.basedir}/../dist-material/release-docs
- /
+
- /webapp
+ webapp
0644
- /webapp
+ webapp
0644
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index e9fe1fb856b383c24537cd6b5c72600885f8a126..3aad323906ad33cc509a9de50de274a742076113 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -239,9 +239,9 @@
run
-
+
-
+
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index 6285c1802ceb0b475814b8219e38976c99f9a20e..81bd232e5b8dd6877f50e14a53817f925117344c 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -116,9 +116,9 @@
run
-
+
-
+
@@ -128,13 +128,13 @@
run
-
+
-
+
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml
index fc4605549499e04d3840be705961b24c2727bf2a..202ddef85078452755a00ac8f30687e424c4b751 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -189,7 +189,7 @@
run
-
+
@@ -199,7 +199,7 @@
-
+
diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml
index 1bf1c52a293f28ca216c07fa44c7e1dcaecd53ad..12146fd23c4ac22c2f49d891ffd0e5e4784fd6d1 100644
--- a/apm-sniffer/apm-toolkit-activation/pom.xml
+++ b/apm-sniffer/apm-toolkit-activation/pom.xml
@@ -115,7 +115,7 @@
run
-
+
@@ -125,7 +125,7 @@
-
+
diff --git a/apm-sniffer/bootstrap-plugins/pom.xml b/apm-sniffer/bootstrap-plugins/pom.xml
index 18f611aa38a62f5fd0645227507adcb3f6f5c77e..a65219caa623c207ae1548530e17e4ba3dabfb45 100644
--- a/apm-sniffer/bootstrap-plugins/pom.xml
+++ b/apm-sniffer/bootstrap-plugins/pom.xml
@@ -101,7 +101,7 @@
run
-
+
@@ -110,7 +110,7 @@
-
+
@@ -136,4 +136,4 @@
-
\ No newline at end of file
+
diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml
index b7984133ddd672d6254e2fca92d50572e71c8c12..3742b7ae4dd9698dfa2e4bef1eecedf5dc6f4219 100644
--- a/apm-sniffer/optional-plugins/pom.xml
+++ b/apm-sniffer/optional-plugins/pom.xml
@@ -106,7 +106,7 @@
run
-
+
@@ -115,7 +115,7 @@
-
+
@@ -141,4 +141,4 @@
-
\ No newline at end of file
+
diff --git a/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml b/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
index a2b75d484f805532133ab1070c1ad50c4fcc6206..6f7b27dc3091a751a6dec929a112995512d65eb3 100644
--- a/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
+++ b/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
@@ -118,7 +118,7 @@
run
-
+
@@ -127,7 +127,7 @@
-
+
@@ -153,4 +153,4 @@
-
\ No newline at end of file
+
diff --git a/oap-server/server-library/library-util/pom.xml b/oap-server/server-library/library-util/pom.xml
index 0066ff8acf9df9263d4d13a11886ba419ff7a910..606666b6827e921dc2e6e5c1c7039a8dbf3d3200 100644
--- a/oap-server/server-library/library-util/pom.xml
+++ b/oap-server/server-library/library-util/pom.xml
@@ -37,11 +37,6 @@
joda-time
joda-time
-
- org.yaml
- snakeyaml
- test
-
com.github.stefanbirkner
system-rules
diff --git a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/v2/metrics_service.proto b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/v2/metrics_service.proto
index 9cca707b8f8ac73c7f9514cac3ab9a959d190b25..57aefd4312e183e0878ac0b26cd1ec88e14b4f10 100644
--- a/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/v2/metrics_service.proto
+++ b/oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/v2/metrics_service.proto
@@ -10,12 +10,6 @@ option java_generic_services = true;
import "envoy/service/metrics/v3/metrics_service.proto";
-// This line is different from the definition in https://github.com/envoyproxy/data-plane-api to let
-// the dependency structure clearer.
-import "prometheus/client_model/metrics.proto";
-
-import "validate/validate.proto";
-
// Service for streaming metrics to server that consumes the metrics data. It uses Prometheus metric
// data model as a standard to represent metrics information.
service MetricsService {