Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Test with Maven
run: mvn clean install -B -U --file pom.xml
run: mvn clean verify -B -U --file pom.xml
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./**/target/site/jacoco/jacoco.xml
flags: pull-request
name: PR-Coverage
fail_ci_if_error: false
verbose: true
JDK21-Test:
runs-on: ubuntu-latest
steps:
Expand Down
14 changes: 4 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,22 @@ tRPC-Java has the following features:

### Dependency environment

JDK 1.8.0_251+, Maven 3.6.3+

> Please compile tRPC-Java through `mvn -Dmaven.test.skip=true clean install`. If you want to run unit tests, you need to use JDK 8.
JDK 17+, Maven 3.8.6+

### Import dependencies

Version 2.x supports JDK 17 and Spring Boot 3, while Version 1.x supports JDK 8 and Spring Boot 2.

```pom
<dependencies>
<dependency>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-mini</artifactId>
<version>1.0.0</version>
<version>2.0.4</version>
</dependency>
</dependencies>
```

#### Use coroutine

It is recommended to use [Tencent Kona JDK FIBER 8](https://github.com/Tencent/TencentKona-8). For
usage examples,
see [coroutine](https://github.com/trpc-group/trpc-java-examples/tree/master/trpc-coroutine)

<h2 id="2">Related Documentation</h2>

- [Quick start](/docs/en/1.quick_start.md)
Expand Down
13 changes: 4 additions & 9 deletions README.zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,22 @@ tRPC-Java 具有以下特点:

### 依赖环境

JDK 1.8.0_251+, Maven 3.6.3+

> 请通过 `mvn -Dmaven.test.skip=true clean install` 编译tRPC-Java。如果运行单元测试需使用JDK 8执行。
JDK 17+, Maven 3.8.6+

### 引入依赖

2.x 版本支持JDK 17 和 SpringBoot 3,1.x 版本 支持JDK 8 和 SpringBoot 2.

```pom
<dependencies>
<dependency>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-mini</artifactId>
<version>1.0.0</version>
<version>2.0.4</version>
</dependency>
</dependencies>
```

#### 使用协程

推荐使用 [Tencent Kona JDK FIBER 8](https://github.com/Tencent/TencentKona-8)
使用示例见[coroutine](https://github.com/trpc-group/trpc-java-examples/tree/master/trpc-coroutine)

<h2 id="2">相关文档</h2>

- [快速上手](/docs/zh/1.quick_start.md)
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Trpc Parent Project ${project.version}</description>
<name>trpc</name>
Expand Down Expand Up @@ -203,7 +203,6 @@
</argLine>
<testFailureIgnore>${maven.ignore.testfailure}</testFailureIgnore>
<skipTests>false</skipTests>
<reportsDirectory>../../site/junit</reportsDirectory>
<useSystemClassLoader>false</useSystemClassLoader>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
Expand Down Expand Up @@ -297,7 +296,8 @@
</goals>
<configuration>
<dataFile>${project.build.directory}/coverage.exec</dataFile>
<outputDirectory>../../site/${project.artifactId}</outputDirectory>
<outputDirectory>${project.build.directory}/site/jacoco
</outputDirectory>
</configuration>
</execution>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion trpc-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-admin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-admin/trpc-admin-default/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-admin</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion trpc-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-bootstrap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-bootstrap/trpc-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-bootstrap</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion trpc-code-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>trpc-parent</artifactId>
<groupId>com.tencent.trpc</groupId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-code-generator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-configcenter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>trpc-parent</artifactId>
<groupId>com.tencent.trpc</groupId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion trpc-configcenter/trpc-configcenter-nacos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-configcenter</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion trpc-configcenter/trpc-configcenter-open-polaris/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-configcenter</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion trpc-container/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-container</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-container/trpc-container-default/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-container</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion trpc-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class Version {
* VERSION: Do not modify the line number of this line. If you want to modify it, be sure to change deploy.sh at
* the same time.
*/
public static final String VERSION = "v2.0.3";
public static final String VERSION = "v2.0.4";
public static final String SNAPSHOT_VERSION = VERSION + VERSION_SUFFIX;
/**
* IS_FORMAL_VERSION: Do not modify the line number of this line. If you want to modify it, be sure to change
Expand Down
2 changes: 1 addition & 1 deletion trpc-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-demo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-demo/trpc-java-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-demo</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>
<name>trpc-demo</name>
<description>Demo project for Spring Boot</description>
Expand Down
2 changes: 1 addition & 1 deletion trpc-demo/trpc-spring-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-demo</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<name>trpc-spring-demo Maven Webapp</name>
Expand Down
2 changes: 1 addition & 1 deletion trpc-demo/trpc-spring-demo/trpc-spring-client-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>trpc-spring-demo</artifactId>
<groupId>com.tencent.trpc</groupId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion trpc-demo/trpc-spring-demo/trpc-spring-demo-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-spring-demo</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-spring-demo-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-demo/trpc-spring-demo/trpc-spring-server-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>trpc-spring-demo</artifactId>
<groupId>com.tencent.trpc</groupId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion trpc-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>trpc-parent</artifactId>
<groupId>com.tencent.trpc</groupId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion trpc-dependencies/trpc-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-bom</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>trpc-bom</description>
<name>trpc</name>
Expand Down
2 changes: 1 addition & 1 deletion trpc-dependencies/trpc-dependencies-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-dependencies-bom</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<description>trpc-dependencies-bom</description>
<name>trpc</name>
Expand Down
2 changes: 1 addition & 1 deletion trpc-dependencies/trpc-mini/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-dependencies</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion trpc-dependencies/trpc-standard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>trpc-dependencies</artifactId>
<groupId>com.tencent.trpc</groupId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion trpc-limiter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-limiter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-limiter/trpc-limiter-sentinel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-limiter</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion trpc-logger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-logger</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-logger/trpc-logger-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-logger</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion trpc-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>trpc-parent</artifactId>
<groupId>com.tencent.trpc</groupId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<name>trpc-maven-plugin</name>
Expand Down
2 changes: 1 addition & 1 deletion trpc-opentelemetry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-opentelemetry</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-proto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-parent</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<artifactId>trpc-proto</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion trpc-proto/trpc-proto-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-proto</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion trpc-proto/trpc-proto-standard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-proto</artifactId>
<version>2.0.3-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
Loading
Loading