From 5bf1afa9e79139b72c00b2fda1831a4999a8307d Mon Sep 17 00:00:00 2001 From: leeyazhou Date: Tue, 12 Aug 2025 19:33:11 +0800 Subject: [PATCH 1/6] perf: manage netty version --- .../optional-plugins/netty-http-4.1.x-plugin/pom.xml | 2 -- pom.xml | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/pom.xml b/apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/pom.xml index ca4e3737f7..12866c039c 100644 --- a/apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/pom.xml @@ -30,14 +30,12 @@ UTF-8 - 4.1.51.Final io.netty netty-all - ${netty.version} provided diff --git a/pom.xml b/pom.xml index 128d7f6f00..389b9e5e64 100755 --- a/pom.xml +++ b/pom.xml @@ -266,6 +266,13 @@ async-profiler ${async-profiler.version} + + io.netty + netty-bom + ${netty.version} + pom + import + From 1532463bc15c438ddd78c6c48e75e2bd55ead00d Mon Sep 17 00:00:00 2001 From: leeyazhou Date: Wed, 13 Aug 2025 12:49:41 +0800 Subject: [PATCH 2/6] Build: Update Maven Plugin Versions and Remove Redundant Declarations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated maven-shade-plugin to version 3.2.4 • Updated maven-surefire-plugin to version 3.0.0-M8 • Removed redundant version declarations across modules • Centralized plugin version management in the root POM --- apm-protocol/apm-network/pom.xml | 3 -- apm-sniffer/apm-agent-core/pom.xml | 6 --- .../httpClient-4.x-plugin/pom.xml | 1 - .../httpclient-5.x-plugin/pom.xml | 1 - apm-sniffer/apm-sdk-plugin/pom.xml | 1 - .../tomcat-7.x-8.x-plugin/pom.xml | 1 - .../websphere-liberty-23.x-plugin/pom.xml | 1 - apm-sniffer/apm-test-tools/pom.xml | 1 - .../gateway-2.0.x-plugin/pom.xml | 1 - .../gateway-2.1.x-plugin/pom.xml | 1 - .../gateway-3.x-plugin/pom.xml | 1 - .../gateway-4.x-plugin/pom.xml | 1 - .../shenyu-2.4.x-plugin/pom.xml | 1 - .../kafka-reporter-plugin/pom.xml | 1 - pom.xml | 37 +++++++++++++++---- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index eda94f4e65..7a595eea97 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -35,12 +35,10 @@ io.netty netty-handler-proxy - ${netty.version} io.netty netty-codec-http2 - ${netty.version} io.grpc @@ -75,7 +73,6 @@ io.netty netty-tcnative-boringssl-static - ${netty-tcnative-boringssl-static.version} org.apache.tomcat diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 19241fcd2c..73a92b2c48 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -81,7 +81,6 @@ net.bytebuddy byte-buddy-agent - ${bytebuddy.version} test @@ -140,11 +139,6 @@ org.slf4j slf4j-api - - org.openjdk.jmh - jmh-generator-annprocess - test - tools.profiler async-profiler diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml index e2786ece2d..c1a93aceaa 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -55,7 +55,6 @@ junit junit - ${junit.version} test diff --git a/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/pom.xml index 030bace429..1b45528e97 100644 --- a/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/pom.xml @@ -46,7 +46,6 @@ junit junit - ${junit.version} test diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 6c6c30c9d6..36aa71c7ab 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -165,7 +165,6 @@ net.bytebuddy byte-buddy - ${bytebuddy.version} provided diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index 5a38651fca..cfada90ea7 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -40,7 +40,6 @@ junit junit - ${junit.version} test diff --git a/apm-sniffer/apm-sdk-plugin/websphere-liberty-23.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/websphere-liberty-23.x-plugin/pom.xml index b0ef592eb7..b15b3b9598 100644 --- a/apm-sniffer/apm-sdk-plugin/websphere-liberty-23.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/websphere-liberty-23.x-plugin/pom.xml @@ -35,7 +35,6 @@ junit junit - ${junit.version} test diff --git a/apm-sniffer/apm-test-tools/pom.xml b/apm-sniffer/apm-test-tools/pom.xml index c9a74371ee..991b95cbb6 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -38,7 +38,6 @@ junit junit - ${junit.version} provided diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/pom.xml index 6ca7443606..feab1be64b 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.0.x-plugin/pom.xml @@ -61,7 +61,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 package diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml index 7fd5f57275..a4be9cf053 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml @@ -61,7 +61,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 package diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/pom.xml index e50550cd3a..93a6e49c66 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-3.x-plugin/pom.xml @@ -52,7 +52,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 package diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-4.x-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-4.x-plugin/pom.xml index ffa82d61b4..6889f978dd 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-4.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-4.x-plugin/pom.xml @@ -52,7 +52,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 package diff --git a/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/pom.xml b/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/pom.xml index b76db5ddcd..d5e953f3ba 100644 --- a/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/shenyu-2.4.x-plugin/pom.xml @@ -63,7 +63,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.4 package 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 a9ba55cc5a..c831fc0957 100644 --- a/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml +++ b/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml @@ -137,7 +137,6 @@ org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.version} copy diff --git a/pom.xml b/pom.xml index 389b9e5e64..9c5e865e74 100755 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,6 @@ 0.6.1 3.25.5 1.68.1 - 2.0.48.Final 1.3.2 3.1 3.0 @@ -112,18 +111,19 @@ 2.22.0 3.2.0 3.1.0 - 3.1.1 + 3.2.4 3.0.0-M2 3.10.1 3.1.0 3.0.1 + 3.0.0-M8 2.5 4.3.0 3.2.1 1.33 1.5 true - + 0.46.0 @@ -320,6 +320,32 @@ %a-%t-%i + + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + + + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + maven-resources-plugin + ${maven-resource-plugin.version} + + + maven-source-plugin + ${maven-source-plugin.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + @@ -338,7 +364,6 @@ maven-enforcer-plugin - ${maven-enforcer-plugin.version} enforce-java @@ -362,7 +387,6 @@ maven-compiler-plugin - ${maven-compiler-plugin.version} ${compiler.version} ${compiler.version} @@ -371,7 +395,6 @@ maven-resources-plugin - ${maven-resource-plugin.version} ${project.build.sourceEncoding} @@ -386,7 +409,6 @@ maven-source-plugin - ${maven-source-plugin.version} attach-sources @@ -461,7 +483,6 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M8 1 false From eb36cd322848ec9acf9d4957218de5e3f302d3b4 Mon Sep 17 00:00:00 2001 From: leeyazhou Date: Thu, 14 Aug 2025 09:52:40 +0800 Subject: [PATCH 3/6] revert: netty-tcnative-boringssl-static version manage - revert property 2.0.48.Final - manage netty-tcnative-boringssl-static's version in root pom.xml ```xml io.netty netty-tcnative-boringssl-static ${netty-tcnative-boringssl-static.version} io.netty netty-tcnative-classes ${netty-tcnative-boringssl-static.version} ``` --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 54c8b3cd08..3c5236b41b 100755 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,7 @@ 0.6.1 3.25.5 1.68.1 + 2.0.48.Final 1.3.2 3.1 3.0 @@ -273,6 +274,16 @@ pom import + + io.netty + netty-tcnative-boringssl-static + ${netty-tcnative-boringssl-static.version} + + + io.netty + netty-tcnative-classes + ${netty-tcnative-boringssl-static.version} + From 84c0871f99b91ce6fcf46921502a559f935af56b Mon Sep 17 00:00:00 2001 From: leeyazhou Date: Thu, 14 Aug 2025 10:45:41 +0800 Subject: [PATCH 4/6] build: rm netty-tcnative-boringssl-static.version use property `netty-tcnative-boringssl-static.version` in root pom.xml --- apm-sniffer/apm-agent-core/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 73a92b2c48..89fd4b80dc 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -36,7 +36,6 @@ ${project.build.outputDirectory}/skywalking-agent-version.properties 32.0.1-jre 2.6.0 - 2.0.7.Final 1.4.1.Final 4.9.10 com.google From e97dedb4986dc9dc5c0e82f4dc6094dacf227150 Mon Sep 17 00:00:00 2001 From: leeyazhou Date: Fri, 15 Aug 2025 09:46:38 +0800 Subject: [PATCH 5/6] docs: update CHANGES.md Centralized plugin version management in the root POM and Remove Redundant Declarations by PR #766 --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 116241e4d8..560e67e8de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,7 @@ Release Notes. * Support gRPC 1.59.x and 1.70.x server interceptor trace * Fix the `CreateAopProxyInterceptor` in the Spring core-patch changes the AOP proxy type when a class is enhanced by both SkyWalking and Spring AOP. +* Build: Centralized plugin version management in the root POM and Remove Redundant Declarations by PR #766 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/236?closed=1) From 9bcc0de53599f0cb08c2b5fa04bf76533eff9064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 15 Aug 2025 09:59:09 +0800 Subject: [PATCH 6/6] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 560e67e8de..2049466573 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,7 +19,7 @@ Release Notes. * Support gRPC 1.59.x and 1.70.x server interceptor trace * Fix the `CreateAopProxyInterceptor` in the Spring core-patch changes the AOP proxy type when a class is enhanced by both SkyWalking and Spring AOP. -* Build: Centralized plugin version management in the root POM and Remove Redundant Declarations by PR #766 +* Build: Centralized plugin version management in the root POM and remove redundant declarations. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/236?closed=1)