Skip to content

Commit 71918d0

Browse files
authored
(build)version management for maven-pulgin and artifactId (#766)
Build: Update Maven Plugin Versions and Remove Redundant Declarations • Removed redundant version declarations across modules for `netty` and `junit` • Remove duplicate artifactId declarations `jmh-generator-annprocess` in `apm-sniffer/apm-agent-core/pom.xml` • Centralized plugin (`maven-shade-plugin` and `maven-surefire-plugin` ) version management in the root POM • Centralized `netty` version management in the root POM by add `netty-bom` • (fix)Declare property `maven-docker-plugin.version`
1 parent e070270 commit 71918d0

File tree

17 files changed

+47
-31
lines changed

17 files changed

+47
-31
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Release Notes.
1919
* Support gRPC 1.59.x and 1.70.x server interceptor trace
2020
* Fix the `CreateAopProxyInterceptor` in the Spring core-patch changes the AOP proxy type when a class is
2121
enhanced by both SkyWalking and Spring AOP.
22+
* Build: Centralized plugin version management in the root POM and remove redundant declarations.
2223

2324
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/236?closed=1)
2425

apm-protocol/apm-network/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@
3535
<dependency>
3636
<groupId>io.netty</groupId>
3737
<artifactId>netty-handler-proxy</artifactId>
38-
<version>${netty.version}</version>
3938
</dependency>
4039
<dependency>
4140
<groupId>io.netty</groupId>
4241
<artifactId>netty-codec-http2</artifactId>
43-
<version>${netty.version}</version>
4442
</dependency>
4543
<dependency>
4644
<groupId>io.grpc</groupId>
@@ -75,7 +73,6 @@
7573
<dependency>
7674
<groupId>io.netty</groupId>
7775
<artifactId>netty-tcnative-boringssl-static</artifactId>
78-
<version>${netty-tcnative-boringssl-static.version}</version>
7976
</dependency>
8077
<dependency> <!-- necessary for Java 9+ -->
8178
<groupId>org.apache.tomcat</groupId>

apm-sniffer/apm-agent-core/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<generateGitPropertiesFilename>${project.build.outputDirectory}/skywalking-agent-version.properties</generateGitPropertiesFilename>
3737
<guava.version>32.0.1-jre</guava.version>
3838
<wiremock.version>2.6.0</wiremock.version>
39-
<netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>
4039
<os-maven-plugin.version>1.4.1.Final</os-maven-plugin.version>
4140
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
4241
<shade.com.google.source>com.google</shade.com.google.source>
@@ -81,7 +80,6 @@
8180
<dependency>
8281
<groupId>net.bytebuddy</groupId>
8382
<artifactId>byte-buddy-agent</artifactId>
84-
<version>${bytebuddy.version}</version>
8583
<scope>test</scope>
8684
</dependency>
8785
<dependency>
@@ -140,11 +138,6 @@
140138
<groupId>org.slf4j</groupId>
141139
<artifactId>slf4j-api</artifactId>
142140
</dependency>
143-
<dependency>
144-
<groupId>org.openjdk.jmh</groupId>
145-
<artifactId>jmh-generator-annprocess</artifactId>
146-
<scope>test</scope>
147-
</dependency>
148141
<dependency>
149142
<groupId>tools.profiler</groupId>
150143
<artifactId>async-profiler</artifactId>

apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<dependency>
5656
<groupId>junit</groupId>
5757
<artifactId>junit</artifactId>
58-
<version>${junit.version}</version>
5958
<scope>test</scope>
6059
</dependency>
6160
</dependencies>

apm-sniffer/apm-sdk-plugin/httpclient-5.x-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<dependency>
4747
<groupId>junit</groupId>
4848
<artifactId>junit</artifactId>
49-
<version>${junit.version}</version>
5049
<scope>test</scope>
5150
</dependency>
5251
</dependencies>

apm-sniffer/apm-sdk-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@
165165
<dependency>
166166
<groupId>net.bytebuddy</groupId>
167167
<artifactId>byte-buddy</artifactId>
168-
<version>${bytebuddy.version}</version>
169168
<scope>provided</scope>
170169
</dependency>
171170
<dependency>

apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<dependency>
4141
<groupId>junit</groupId>
4242
<artifactId>junit</artifactId>
43-
<version>${junit.version}</version>
4443
<scope>test</scope>
4544
</dependency>
4645
<dependency>

apm-sniffer/apm-sdk-plugin/websphere-liberty-23.x-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<dependency>
3636
<groupId>junit</groupId>
3737
<artifactId>junit</artifactId>
38-
<version>${junit.version}</version>
3938
<scope>test</scope>
4039
</dependency>
4140
</dependencies>

apm-sniffer/apm-test-tools/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<dependency>
3939
<groupId>junit</groupId>
4040
<artifactId>junit</artifactId>
41-
<version>${junit.version}</version>
4241
<scope>provided</scope>
4342
</dependency>
4443
<dependency>

apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@
3030

3131
<properties>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33-
<netty.version>4.1.51.Final</netty.version>
3433
</properties>
3534

3635
<dependencies>
3736
<dependency>
3837
<groupId>io.netty</groupId>
3938
<artifactId>netty-all</artifactId>
40-
<version>${netty.version}</version>
4139
<scope>provided</scope>
4240
</dependency>
4341
</dependencies>

0 commit comments

Comments
 (0)