Skip to content

Commit e884a84

Browse files
smilu97smilu97
committed
[#noissue] Unified dependency versions: logback, gson, errorprone, protobuf
1 parent da7f2f9 commit e884a84

File tree

16 files changed

+84
-5
lines changed

16 files changed

+84
-5
lines changed

‎agent-testweb/agentsdk-async-testweb/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<dependency>
2727
<groupId>org.springframework.boot</groupId>
2828
<artifactId>spring-boot-starter-logging</artifactId>
29+
<exclusions>
30+
<exclusion>
31+
<groupId>ch.qos.logback</groupId>
32+
<artifactId>logback-classic</artifactId>
33+
</exclusion>
34+
</exclusions>
2935
</dependency>
3036
<dependency>
3137
<groupId>org.springframework.boot</groupId>

‎agent-testweb/bom/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@
5151
<groupId>org.springframework.boot</groupId>
5252
<artifactId>spring-boot-starter-logging</artifactId>
5353
<version>${spring.boot.version}</version>
54+
<exclusions>
55+
<exclusion>
56+
<groupId>ch.qos.logback</groupId>
57+
<artifactId>logback-classic</artifactId>
58+
</exclusion>
59+
</exclusions>
5460
</dependency>
5561
<dependency>
5662
<groupId>org.springframework.boot</groupId>

‎agent-testweb/dubbo-plugin-testweb/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
<dependency>
4545
<groupId>org.springframework.boot</groupId>
4646
<artifactId>spring-boot-starter-logging</artifactId>
47+
<exclusions>
48+
<exclusion>
49+
<groupId>ch.qos.logback</groupId>
50+
<artifactId>logback-classic</artifactId>
51+
</exclusion>
52+
</exclusions>
4753
</dependency>
4854
<dependency>
4955
<groupId>org.springframework.boot</groupId>

‎agent-testweb/httpclient4-plugin-testweb/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter-webflux</artifactId>
2727
<version>${spring.boot.version}</version>
28+
<exclusions>
29+
<exclusion>
30+
<groupId>ch.qos.logback</groupId>
31+
<artifactId>logback-classic</artifactId>
32+
</exclusion>
33+
</exclusions>
2834
</dependency>
2935
<dependency>
3036
<groupId>org.springframework.boot</groupId>

‎agent-testweb/paho-mqtt-plugin-testweb/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
<dependency>
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-logging</artifactId>
35+
<exclusions>
36+
<exclusion>
37+
<groupId>ch.qos.logback</groupId>
38+
<artifactId>logback-classic</artifactId>
39+
</exclusion>
40+
</exclusions>
3541
</dependency>
3642
<dependency>
3743
<groupId>org.springframework.boot</groupId>

‎agent-testweb/reactor-netty-plugin-testweb/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<dependency>
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-logging</artifactId>
32+
<exclusions>
33+
<exclusion>
34+
<groupId>ch.qos.logback</groupId>
35+
<artifactId>logback-classic</artifactId>
36+
</exclusion>
37+
</exclusions>
3238
</dependency>
3339
<dependency>
3440
<groupId>org.springframework.boot</groupId>

‎agent-testweb/rocketmq-plugin-testweb/rocketmq-original/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
<dependency>
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-logging</artifactId>
35+
<exclusions>
36+
<exclusion>
37+
<groupId>ch.qos.logback</groupId>
38+
<artifactId>logback-classic</artifactId>
39+
</exclusion>
40+
</exclusions>
3541
</dependency>
3642
<dependency>
3743
<groupId>org.springframework.boot</groupId>

‎agent-testweb/rocketmq-plugin-testweb/rocketmq-springboot/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
<dependency>
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-logging</artifactId>
35+
<exclusions>
36+
<exclusion>
37+
<groupId>ch.qos.logback</groupId>
38+
<artifactId>logback-classic</artifactId>
39+
</exclusion>
40+
</exclusions>
3541
</dependency>
3642
<dependency>
3743
<groupId>org.springframework.boot</groupId>

‎agent-testweb/rocketmq-plugin-testweb/rocketmq-springcloud-stream/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
<dependency>
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-logging</artifactId>
35+
<exclusions>
36+
<exclusion>
37+
<groupId>ch.qos.logback</groupId>
38+
<artifactId>logback-classic</artifactId>
39+
</exclusion>
40+
</exclusions>
3541
</dependency>
3642
<dependency>
3743
<groupId>org.springframework.boot</groupId>

‎agent-testweb/thread-plugin-testweb/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<dependency>
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-logging</artifactId>
32+
<exclusions>
33+
<exclusion>
34+
<groupId>ch.qos.logback</groupId>
35+
<artifactId>logback-classic</artifactId>
36+
</exclusion>
37+
</exclusions>
3238
</dependency>
3339
<dependency>
3440
<groupId>org.springframework.boot</groupId>

‎agent-testweb/thrift-plugin-testweb/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<dependency>
2828
<groupId>org.springframework.boot</groupId>
2929
<artifactId>spring-boot-starter-logging</artifactId>
30+
<exclusions>
31+
<exclusion>
32+
<groupId>ch.qos.logback</groupId>
33+
<artifactId>logback-classic</artifactId>
34+
</exclusion>
35+
</exclusions>
3036
</dependency>
3137
<dependency>
3238
<groupId>org.springframework.boot</groupId>

‎hbase2-module/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
<dependency>
8787
<groupId>com.google.code.gson</groupId>
8888
<artifactId>gson</artifactId>
89-
<version>2.8.6</version>
9089
</dependency>
9190

9291
</dependencies>

‎plugins-it/logback-it/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>ch.qos.logback</groupId>
3939
<artifactId>logback-classic</artifactId>
40-
<version>1.2.3</version>
40+
<version>1.2.11</version>
4141
<scope>test</scope>
4242
</dependency>
4343

‎plugins/bom/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@
306306
<dependency>
307307
<groupId>com.google.code.gson</groupId>
308308
<artifactId>gson</artifactId>
309-
<version>2.3.1</version>
310309
</dependency>
311310
<dependency>
312311
<groupId>net.sf.json-lib</groupId>

‎plugins/logback/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>ch.qos.logback</groupId>
2828
<artifactId>logback-core</artifactId>
29-
<version>1.2.5</version>
29+
<version>1.2.11</version>
3030
<scope>provided</scope>
3131
</dependency>
3232
</dependencies>

‎pom.xml

+16-1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
<protoc.version>3.21.7</protoc.version>
186186

187187
<guava.version>31.1-jre</guava.version>
188+
<gson.version>2.10.1</gson.version>
188189

189190
<mybatis.spring.version>2.0.7</mybatis.spring.version>
190191
<mybatis.version>3.5.12</mybatis.version>
@@ -1220,7 +1221,21 @@
12201221
<artifactId>guice</artifactId>
12211222
<version>5.1.0</version>
12221223
</dependency>
1223-
1224+
<dependency>
1225+
<groupId>com.google.code.gson</groupId>
1226+
<artifactId>gson</artifactId>
1227+
<version>${gson.version}</version>
1228+
</dependency>
1229+
<dependency>
1230+
<groupId>com.google.errorprone</groupId>
1231+
<artifactId>error_prone_annotations</artifactId>
1232+
<version>2.11.0</version>
1233+
</dependency>
1234+
<dependency>
1235+
<groupId>com.google.protobuf</groupId>
1236+
<artifactId>protobuf-java</artifactId>
1237+
<version>3.21.7</version>
1238+
</dependency>
12241239

12251240
<dependency>
12261241
<groupId>joda-time</groupId>

0 commit comments

Comments
 (0)