Skip to content

Commit

Permalink
Merge pull request #616 from yidongnan/release/2.13.1
Browse files Browse the repository at this point in the history
Prepare release 2.13.1
  • Loading branch information
yidongnan authored Jan 7, 2022
2 parents fcdc5af + e30e983 commit 92f8ee6
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
15 changes: 8 additions & 7 deletions README-zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ QQ交流群:294712648

2.x.x.RELEASE 支持 Spring Boot 2.1.x/2.2.x 和 Spring Cloud Greenwich / Hoxton。

最新版本: `2.13.0.RELEASE`
最新版本: `2.13.1.RELEASE`

( `2.4.0.RELEASE` 用于 Spring Boot 2.0.x & Spring Cloud Finchy).

Expand All @@ -57,15 +57,15 @@ QQ交流群:294712648
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
<version>2.13.0.RELEASE</version>
<version>2.13.1.RELEASE</version>
</dependency>
````

Gradle:

````gradle
dependencies {
compile 'net.devh:grpc-spring-boot-starter:2.13.0.RELEASE'
compile 'net.devh:grpc-spring-boot-starter:2.13.1.RELEASE'
}
````

Expand All @@ -77,15 +77,15 @@ dependencies {
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
<version>2.13.0.RELEASE</version>
<version>2.13.1.RELEASE</version>
</dependency>
````

Gradle:

````gradle
dependencies {
compile 'net.devh:grpc-server-spring-boot-starter:2.13.0.RELEASE'
compile 'net.devh:grpc-server-spring-boot-starter:2.13.1.RELEASE'
}
````

Expand Down Expand Up @@ -117,17 +117,18 @@ public class GrpcServerService extends GreeterGrpc.GreeterImplBase {
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
<version>2.13.0.RELEASE</version>
<version>2.13.1.RELEASE</version>
</dependency>
````

Gradle:

````gradle
dependencies {
compile 'net.devh:grpc-client-spring-boot-starter:2.13.0.RELEASE'
compile 'net.devh:grpc-client-spring-boot-starter:2.13.1.RELEASE'
}
````

在 grpc 客户端的的 stub 字段上添加 `@GrpcClient(serverName)` 注解。

* 请不要将 @GrpcClient`@Autowireed``@Inject` 一起使用。
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ README: [English](README.md) | [中文](README-zh-CN.md)

## Versions

The latest version is `2.13.0.RELEASE` it was compiled with spring-boot `2.4.5` and spring-cloud `2020.0.2`
The latest version is `2.13.1.RELEASE` it was compiled with spring-boot `2.5.8` and spring-cloud `2020.0.5`
but it is also compatible with a large variety of other versions.
An overview of all versions and their respective library versions can be found in our [documentation](https://yidongnan.github.io/grpc-spring-boot-starter/en/versions.html).

Expand All @@ -66,15 +66,15 @@ To add a dependency using Maven, use the following:
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-spring-boot-starter</artifactId>
<version>2.13.0.RELEASE</version>
<version>2.13.1.RELEASE</version>
</dependency>
````

To add a dependency using Gradle:

````gradle
dependencies {
implementation 'net.devh:grpc-spring-boot-starter:2.13.0.RELEASE'
implementation 'net.devh:grpc-spring-boot-starter:2.13.1.RELEASE'
}
````

Expand All @@ -86,15 +86,15 @@ To add a dependency using Maven, use the following:
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-server-spring-boot-starter</artifactId>
<version>2.13.0.RELEASE</version>
<version>2.13.1.RELEASE</version>
</dependency>
````

To add a dependency using Gradle:

````gradle
dependencies {
implementation 'net.devh:grpc-server-spring-boot-starter:2.13.0.RELEASE'
implementation 'net.devh:grpc-server-spring-boot-starter:2.13.1.RELEASE'
}
````

Expand Down Expand Up @@ -128,15 +128,15 @@ To add a dependency using Maven, use the following:
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
<version>2.13.0.RELEASE</version>
<version>2.13.1.RELEASE</version>
</dependency>
````

To add a dependency using Gradle:

````gradle
dependencies {
compile 'net.devh:grpc-client-spring-boot-starter:2.13.0.RELEASE'
compile 'net.devh:grpc-client-spring-boot-starter:2.13.1.RELEASE'
}
````

Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ buildscript {
}
}
ext {
projectVersion = '2.13.0.RELEASE'
projectVersion = '2.13.1.RELEASE'

// https://github.com/grpc/grpc-java/releases
grpcVersion = '1.42.1'
grpcVersion = '1.42.2'

// https://github.com/google/guava/releases
guavaVersion = '31.0.1-jre'
// https://github.com/protocolbuffers/protobuf/releases
protobufVersion = '3.19.1'
protobufVersion = '3.19.2'
protobufGradlePluginVersion = '0.8.18'

// https://github.com/spring-projects/spring-boot/releases
springBootVersion = '2.5.7'
springBootVersion = '2.5.8'
// https://github.com/spring-cloud/spring-cloud-release/releases
springCloudVersion = '2020.0.4'
springCloudVersion = '2020.0.5'
// https://github.com/alibaba/spring-cloud-alibaba/releases
springCloudAlibabaNacosVersion = '2021.1'
// https://github.com/spring-projects/spring-security-oauth/releases
Expand Down
3 changes: 2 additions & 1 deletion docs/en/versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ Current version.

| Version | spring-boot | spring-cloud | gRPC | Date |
|:-------:|:-----------:|:------------:|:----:| ---: |
| 2.13.0* | 2.5.7 | 2020.0.4 | 1.42.1 | Nov, 2021 |
| 2.13.1 | 2.5.8 | 2020.0.5 | 1.42.2 | Jan, 2022 |
| 2.13.0 | 2.5.7 | 2020.0.4 | 1.42.1 | Nov, 2021 |
| 2.12.0 | 2.4.5 | 2020.0.2 | 1.37.0 | Mai, 2021 |
| 2.11.0 | 2.3.8 | Hoxton | 1.35.0 | Feb, 2021 |
| 2.10.1 | 2.3.3 | Hoxton | 1.31.1 | Aug, 2020 |
Expand Down
1 change: 1 addition & 0 deletions docs/zh-CN/versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

| 版本 | spring-boot | spring-cloud | gRPC | 日期 |
|:---------:|:-----------:|:-----------:|:------:| ----------:|
| 2.13.1 | 2.5.8 | 2020.0.5 | 1.42.2 | 2022年01月 |
| 2.13.0 | 2.5.7 | 2020.0.4 | 1.42.1 | 2021年11月 |
| 2.12.0 | 2.4.5 | 2020.0.2 | 1.34.1 | 2021年05月 |
| 2.11.0 | 2.3.8 | Hoxton | 1.31.1 | 2021年02月 |
Expand Down

0 comments on commit 92f8ee6

Please sign in to comment.