Skip to content

Commit c2ab202

Browse files
wardseptemberwenhshlilylilili
authored
Feat/support springboot3.x (#86)
* feat: support springboot3.x * feat: javax.servlet切换为jakarta.servlet * fix: upgrade jacoco plugin version to support Java 17 and spring boot upgrade to v3.5.0 * fix: correct interface names in trpc_java_client.yaml - Fix GreeterserviceAPI to GreeterServiceAPI and Greeterservice2API to GreeterService2API * 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 * remove spring demo httpcore5, httpclient5 dependencies * feat: delete java version * feat:Add generic parameter passing functionality to the HTTP protocol of trpc-java * feat: 2.0.0 snapshot * feat: upgrade jacoco.agent version * feat: upgrade test jar version * feat: fix mockito-inline version * feat: 改为2.0.1-SNAPSHOT版本 --------- Co-authored-by: wenhsh <wenhsh@126.com> Co-authored-by: trace267 <464282636@qq.com>
1 parent e695c30 commit c2ab202

93 files changed

Lines changed: 586 additions & 206 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.tencent.trpc</groupId>
88
<artifactId>trpc-parent</artifactId>
9-
<version>1.4.0-SNAPSHOT</version>
9+
<version>2.0.1-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111
<description>Trpc Parent Project ${project.version}</description>
1212
<name>trpc</name>
@@ -89,12 +89,12 @@
8989
<maven.source.version>3.0.1</maven.source.version>
9090
<maven.exec.version>3.0.1</maven.exec.version>
9191
<maven.jar.version>3.1.2</maven.jar.version>
92-
<maven.compiler.source>1.8</maven.compiler.source>
93-
<maven.compiler.target>1.8</maven.compiler.target>
92+
<maven.compiler.source>17</maven.compiler.source>
93+
<maven.compiler.target>17</maven.compiler.target>
9494
<maven.compiler.version>3.7.0</maven.compiler.version>
9595
<maven.gpg.version>3.1.0</maven.gpg.version>
9696
<maven.ignore.testfailure>false</maven.ignore.testfailure>
97-
<maven.surefire.version>2.22.0</maven.surefire.version>
97+
<maven.surefire.version>3.1.2</maven.surefire.version>
9898
<maven.javadoc.version>3.0.1</maven.javadoc.version>
9999
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
100100
<exec.maven.version>3.1.0</exec.maven.version>
@@ -122,29 +122,48 @@
122122

123123
<dependencies>
124124
<dependency>
125-
<groupId>org.powermock</groupId>
126-
<artifactId>powermock-module-junit4</artifactId>
125+
<groupId>org.junit.jupiter</groupId>
126+
<artifactId>junit-jupiter-api</artifactId>
127+
<version>5.9.3</version>
127128
<scope>test</scope>
128129
</dependency>
129130
<dependency>
130-
<groupId>org.powermock</groupId>
131-
<artifactId>powermock-api-mockito</artifactId>
131+
<groupId>org.junit.jupiter</groupId>
132+
<artifactId>junit-jupiter-engine</artifactId>
133+
<version>5.9.3</version>
132134
<scope>test</scope>
133135
</dependency>
136+
<!-- 保留 JUnit 4 测试 -->
134137
<dependency>
135-
<groupId>org.powermock</groupId>
136-
<artifactId>powermock-api-support</artifactId>
137-
<scope>test</scope>
138-
</dependency>
139-
<dependency>
140-
<groupId>org.powermock</groupId>
141-
<artifactId>powermock-module-junit4-rule</artifactId>
138+
<groupId>junit</groupId>
139+
<artifactId>junit</artifactId>
140+
<version>4.13.2</version>
142141
<scope>test</scope>
143142
</dependency>
143+
<!-- <dependency>-->
144+
<!-- <groupId>org.powermock</groupId>-->
145+
<!-- <artifactId>powermock-module-junit4</artifactId>-->
146+
<!-- <scope>test</scope>-->
147+
<!-- </dependency>-->
148+
<!-- <dependency>-->
149+
<!-- <groupId>org.powermock</groupId>-->
150+
<!-- <artifactId>powermock-api-mockito2</artifactId>-->
151+
<!-- <scope>test</scope>-->
152+
<!-- </dependency>-->
153+
<!-- <dependency>-->
154+
<!-- <groupId>org.powermock</groupId>-->
155+
<!-- <artifactId>powermock-api-support</artifactId>-->
156+
<!-- <scope>test</scope>-->
157+
<!-- </dependency>-->
158+
<!-- <dependency>-->
159+
<!-- <groupId>org.powermock</groupId>-->
160+
<!-- <artifactId>powermock-module-junit4-rule</artifactId>-->
161+
<!-- <scope>test</scope>-->
162+
<!-- </dependency>-->
144163
<dependency>
145164
<groupId>org.jacoco</groupId>
146165
<artifactId>org.jacoco.agent</artifactId>
147-
<version>0.8.6</version>
166+
<version>0.8.11</version>
148167
<classifier>runtime</classifier>
149168
<scope>test</scope>
150169
</dependency>
@@ -177,6 +196,10 @@
177196
<artifactId>maven-surefire-plugin</artifactId>
178197
<version>${maven.surefire.version}</version>
179198
<configuration>
199+
<argLine>
200+
--add-opens java.base/java.lang=ALL-UNNAMED
201+
--add-opens java.base/java.util=ALL-UNNAMED
202+
</argLine>
180203
<testFailureIgnore>${maven.ignore.testfailure}</testFailureIgnore>
181204
<skipTests>false</skipTests>
182205
<systemPropertyVariables>
@@ -249,7 +272,7 @@
249272
<plugin>
250273
<groupId>org.jacoco</groupId>
251274
<artifactId>jacoco-maven-plugin</artifactId>
252-
<version>0.8.6</version>
275+
<version>0.8.8</version>
253276
<configuration>
254277
<skip>false</skip>
255278
</configuration>

‎trpc-admin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.tencent.trpc</groupId>
99
<artifactId>trpc-parent</artifactId>
10-
<version>1.4.0-SNAPSHOT</version>
10+
<version>2.0.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>trpc-admin</artifactId>

‎trpc-admin/trpc-admin-default/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.tencent.trpc</groupId>
1111
<artifactId>trpc-admin</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>2.0.1-SNAPSHOT</version>
1313
</parent>
1414

1515
<packaging>jar</packaging>

‎trpc-bootstrap/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.tencent.trpc</groupId>
99
<artifactId>trpc-parent</artifactId>
10-
<version>1.4.0-SNAPSHOT</version>
10+
<version>2.0.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>trpc-bootstrap</artifactId>

‎trpc-bootstrap/trpc-server/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.tencent.trpc</groupId>
77
<artifactId>trpc-bootstrap</artifactId>
8-
<version>1.4.0-SNAPSHOT</version>
8+
<version>2.0.1-SNAPSHOT</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>

‎trpc-code-generator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>trpc-parent</artifactId>
99
<groupId>com.tencent.trpc</groupId>
10-
<version>1.4.0-SNAPSHOT</version>
10+
<version>2.0.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>trpc-code-generator</artifactId>

‎trpc-configcenter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>trpc-parent</artifactId>
77
<groupId>com.tencent.trpc</groupId>
8-
<version>1.4.0-SNAPSHOT</version>
8+
<version>2.0.1-SNAPSHOT</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎trpc-configcenter/trpc-configcenter-nacos/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.tencent.trpc</groupId>
88
<artifactId>trpc-configcenter</artifactId>
9-
<version>1.4.0-SNAPSHOT</version>
9+
<version>2.0.1-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<name>${project.artifactId}</name>

‎trpc-configcenter/trpc-configcenter-open-polaris/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.tencent.trpc</groupId>
88
<artifactId>trpc-configcenter</artifactId>
9-
<version>1.4.0-SNAPSHOT</version>
9+
<version>2.0.1-SNAPSHOT</version>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<name>${project.artifactId}</name>

‎trpc-container/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.tencent.trpc</groupId>
99
<artifactId>trpc-parent</artifactId>
10-
<version>1.4.0-SNAPSHOT</version>
10+
<version>2.0.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>trpc-container</artifactId>

0 commit comments

Comments
 (0)