Skip to content

Commit 55a8af8

Browse files
committed
feat: upgrade dependencies for Spring Boot 3.x support - Add jakarta.annotation-api 2.1.1, httpcore5, httpclient5 dependencies - Upgrade log4j to 2.24.3 and fix dependency management
1 parent b5bb023 commit 55a8af8

2 files changed

Lines changed: 22 additions & 3 deletions

File tree

  • trpc-demo/trpc-spring-demo/trpc-spring-server-demo
  • trpc-dependencies/trpc-dependencies-bom

trpc-demo/trpc-spring-demo/trpc-spring-server-demo/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@
1616
<groupId>com.tencent.trpc</groupId>
1717
<artifactId>trpc-springmvc</artifactId>
1818
</dependency>
19+
<dependency>
20+
<groupId>jakarta.annotation</groupId>
21+
<artifactId>jakarta.annotation-api</artifactId>
22+
<version>2.1.1</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.apache.httpcomponents.core5</groupId>
26+
<artifactId>httpcore5</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.httpcomponents.client5</groupId>
30+
<artifactId>httpclient5</artifactId>
31+
</dependency>
1932
</dependencies>
2033

2134
<build>

trpc-dependencies/trpc-dependencies-bom/pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<gson.version>2.8.9</gson.version>
4545
<guava.version>32.1.3-jre</guava.version>
4646
<httpclient.version>4.5.14</httpclient.version>
47+
<httpclient5.version>5.4.1</httpclient5.version>
4748
<httpcore.version>4.4.15</httpcore.version>
4849
<httpcore5.version>5.2.1</httpcore5.version>
4950
<hutool.all.version>5.8.28</hutool.all.version>
@@ -56,15 +57,15 @@
5657
<joda-time.version>2.7</joda-time.version>
5758
<jprotobuf.version>2.4.14</jprotobuf.version>
5859
<junit.version>4.13.2</junit.version>
59-
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
60+
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
6061
<jakarta.activation-api.version>1.2.1</jakarta.activation-api.version>
6162
<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
6263
<jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
6364
<javassist.version>3.28.0-GA</javassist.version>
6465
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
6566
<jsr305.version>3.0.2</jsr305.version>
6667
<logback.version>1.2.13</logback.version>
67-
<logging.log4j.version>2.17.1</logging.log4j.version>
68+
<logging.log4j.version>2.24.3</logging.log4j.version>
6869
<log4j2.ttl.thread.context.map.version>1.3.3</log4j2.ttl.thread.context.map.version>
6970
<maven.gpg.version>3.1.0</maven.gpg.version>
7071
<maven.deploy.version>3.0.0</maven.deploy.version>
@@ -500,6 +501,11 @@
500501
<artifactId>httpclient</artifactId>
501502
<version>${httpclient.version}</version>
502503
</dependency>
504+
<dependency>
505+
<groupId>org.apache.httpcomponents.core5</groupId>
506+
<artifactId>httpcore5</artifactId>
507+
<version>${httpcore5.version}</version>
508+
</dependency>
503509
<dependency>
504510
<groupId>org.apache.httpcomponents.core5</groupId>
505511
<artifactId>httpcore5-h2</artifactId>
@@ -508,7 +514,7 @@
508514
<dependency>
509515
<groupId>org.apache.httpcomponents.client5</groupId>
510516
<artifactId>httpclient5</artifactId>
511-
<version>${httpcore5.version}</version>
517+
<version>${httpclient5.version}</version>
512518
</dependency>
513519
<dependency>
514520
<artifactId>curator-recipes</artifactId>

0 commit comments

Comments
 (0)