diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index 5d0300a5a..3221a1dcb 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -57,6 +57,19 @@ + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + initialize + + detect + + + + org.xolstice.maven.plugins protobuf-maven-plugin @@ -75,6 +88,7 @@ + grpc-build compile compile-custom diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index ecc36f89a..864031594 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -129,14 +129,20 @@ - - + + kr.motd.maven os-maven-plugin ${os-maven-plugin.version} - - - + + + initialize + + detect + + + + maven-shade-plugin diff --git a/oap-server/server-configuration/grpc-configuration-sync/pom.xml b/oap-server/server-configuration/grpc-configuration-sync/pom.xml index 2babab1a2..f50951073 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/pom.xml +++ b/oap-server/server-configuration/grpc-configuration-sync/pom.xml @@ -58,14 +58,20 @@ - - + + kr.motd.maven os-maven-plugin - 1.4.1.Final - - - + ${os-maven-plugin.version} + + + initialize + + detect + + + + org.apache.maven.plugins maven-resources-plugin diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml index 4dbd74c27..c6d7ae594 100644 --- a/oap-server/server-core/pom.xml +++ b/oap-server/server-core/pom.xml @@ -94,14 +94,20 @@ - - + + kr.motd.maven os-maven-plugin - 1.4.1.Final - - - + ${os-maven-plugin.version} + + + initialize + + detect + + + + org.apache.maven.plugins maven-resources-plugin diff --git a/oap-server/server-receiver-plugin/receiver-proto/pom.xml b/oap-server/server-receiver-plugin/receiver-proto/pom.xml index 0b70012c5..e504e646a 100644 --- a/oap-server/server-receiver-plugin/receiver-proto/pom.xml +++ b/oap-server/server-receiver-plugin/receiver-proto/pom.xml @@ -30,6 +30,19 @@ + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + initialize + + detect + + + + org.xolstice.maven.plugins protobuf-maven-plugin diff --git a/pom.xml b/pom.xml index 91f6db3b8..5ae6c16ef 100755 --- a/pom.xml +++ b/pom.xml @@ -279,13 +279,6 @@ - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - @@ -346,6 +339,19 @@ + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + initialize + + detect + + + + maven-enforcer-plugin ${maven-enforcer-plugin.version} @@ -384,6 +390,8 @@ **/.project **/.settings/** **/dependency-reduced-pom.xml + **/.vscode/** + **/.factorypath **/skywalking-ui/.editorconfig diff --git a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml index 30b6b8419..137f9857c 100644 --- a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml +++ b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml @@ -63,6 +63,19 @@ + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + initialize + + detect + + + + io.fabric8 docker-maven-plugin @@ -175,13 +188,6 @@ - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - \ No newline at end of file diff --git a/test/plugin/scenarios/grpc-scenario/pom.xml b/test/plugin/scenarios/grpc-scenario/pom.xml index d6f8a139c..a70cbcc71 100644 --- a/test/plugin/scenarios/grpc-scenario/pom.xml +++ b/test/plugin/scenarios/grpc-scenario/pom.xml @@ -30,6 +30,7 @@ UTF-8 1.8 + 1.6.2 1.6.0 @@ -76,14 +77,20 @@ grpc-scenario - - + + kr.motd.maven os-maven-plugin - 1.5.0.Final - - - + ${os-maven-plugin.version} + + + initialize + + detect + + + + org.springframework.boot spring-boot-maven-plugin