Skip to content

Commit ee1f2a5

Browse files
authored
Merge pull request #68 from yidongnan/1.4.0
release 1.4.0.RELEASE
2 parents a7b05a1 + 79d5367 commit ee1f2a5

File tree

30 files changed

+140
-108
lines changed

30 files changed

+140
-108
lines changed

README-zh.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ Java技术交流群:294712648 <a target="_blank" href="http://shang.qq.com/wpa
2828
<dependency>
2929
<groupId>net.devh</groupId>
3030
<artifactId>grpc-server-spring-boot-starter</artifactId>
31-
<version>1.3.0.RELEASE</version>
31+
<version>1.4.0.RELEASE</version>
3232
</dependency>
3333
````
3434

3535
添加依赖如果使用的是Gradle
3636

3737
````
3838
dependencies {
39-
compile 'net.devh:grpc-server-spring-boot-starter:1.3.0.RELEASE'
39+
compile 'net.devh:grpc-server-spring-boot-starter:1.4.0.RELEASE'
4040
}
4141
````
4242

@@ -58,8 +58,8 @@ public class GrpcServerService extends GreeterGrpc.GreeterImplBase {
5858
设置 gRPC 的 host 跟 port 在application.properties,默认的监听的 host 是 0.0.0.0,默认的 port 是 9090
5959

6060
````
61-
grpc.server.port=
62-
grpc.server.address=
61+
grpc.server.port=9090
62+
grpc.server.address=0.0.0.0
6363
````
6464

6565
### gRPC 客户端
@@ -70,15 +70,15 @@ grpc.server.address=
7070
<dependency>
7171
<groupId>net.devh</groupId>
7272
<artifactId>grpc-client-spring-boot-starter</artifactId>
73-
<version>1.3.0.RELEASE</version>
73+
<version>1.4.0.RELEASE</version>
7474
</dependency>
7575
````
7676

7777
添加依赖如果使用的是Gradle
7878

7979
````
8080
dependencies {
81-
compile 'net.devh:grpc-client-spring-boot-starter:1.3.0.RELEASE'
81+
compile 'net.devh:grpc-client-spring-boot-starter:1.4.0.RELEASE'
8282
}
8383
````
8484

@@ -109,6 +109,7 @@ grpc.client.(gRPC server name).port[0]=
109109
110110
| Project Version | gRPC-java Version |
111111
| ---------------- | ------------------ |
112+
| 1.4.0.RELEASE | 1.10.0 |
112113
| 1.3.0.RELEASE | 1.6.1 |
113114
| 1.2.0.RELEASE | 1.3.0 |
114115
| 1.1.1.RELEASE | 1.2.0 |

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ To add a dependency using Maven, use the following:
2727
<dependency>
2828
<groupId>net.devh</groupId>
2929
<artifactId>grpc-server-spring-boot-starter</artifactId>
30-
<version>1.3.0-RELEASE</version>
30+
<version>1.4.0.RELEASE</version>
3131
</dependency>
3232
````
3333

3434
To add a dependency using Gradle:
3535

3636
````
3737
dependencies {
38-
compile 'net.devh:grpc-server-spring-boot-starter:1.3.0.RELEASE'
38+
compile 'net.devh:grpc-server-spring-boot-starter:1.4.0.RELEASE'
3939
}
4040
````
4141

@@ -60,15 +60,15 @@ To add a dependency using Maven, use the following:
6060
<dependency>
6161
<groupId>net.devh</groupId>
6262
<artifactId>grpc-client-spring-boot-starter</artifactId>
63-
<version>1.3.0-RELEASE</version>
63+
<version>1.4.0.RELEASE</version>
6464
</dependency>
6565
````
6666

6767
To add a dependency using Gradle:
6868

6969
````
7070
dependencies {
71-
compile 'net.devh:grpc-client-spring-boot-starter:1.3.0-RELEASE'
71+
compile 'net.devh:grpc-client-spring-boot-starter:1.4.0.RELEASE'
7272
}
7373
````
7474

@@ -82,8 +82,8 @@ private Channel serverChannel;
8282
set gRPC host and port in application.properties, default host is 0.0.0.0 and default port is 9090
8383

8484
````
85-
grpc.server.port=
86-
grpc.server.address=
85+
grpc.server.port=9090
86+
grpc.server.address=0.0.0.0
8787
````
8888

8989
gRPC request
@@ -106,6 +106,7 @@ grpc.client.(gRPC server name).port[0]=
106106
107107
| Project Version | gRPC-java Version |
108108
| ---------------- | ------------------ |
109+
| 1.4.0.RELEASE | 1.10.0 |
109110
| 1.3.0.RELEASE | 1.6.1 |
110111
| 1.2.0.RELEASE | 1.3.0 |
111112
| 1.1.1.RELEASE | 1.2.0 |

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ buildscript {
77
maven { url "https://plugins.gradle.org/m2/" }
88
}
99
ext {
10-
projectVersion = '1.3.0-RELEASE'
10+
projectVersion = '1.4.0.RELEASE'
1111

12-
grpcVersion = '1.6.1'
13-
protobufVersion = '3.3.0'
14-
protobufGradlePluginVersion = '0.8.0'
12+
grpcVersion = '1.10.0'
13+
protobufVersion = '3.5.1'
14+
protobufGradlePluginVersion = '0.8.4'
1515

16-
springBootVersion = '1.5.6.RELEASE'
17-
springSleuthVersion = '1.2.4.RELEASE'
18-
springCloudVersion = 'Dalston.SR3'
19-
springCloudConsulVersion = '1.2.1.RELEASE'
20-
springCloudEurekaVersion = '1.3.4.RELEASE'
16+
springBootVersion = '1.5.10.RELEASE'
17+
springSleuthVersion = '1.3.2.RELEASE'
18+
springCloudVersion = 'Edgware.SR2'
19+
springCloudConsulVersion = '1.3.2.RELEASE'
20+
springCloudEurekaVersion = '1.4.3.RELEASE'
2121
}
2222
dependencies {
2323
classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE"
@@ -70,7 +70,7 @@ allprojects {
7070
maven { url "https://plugins.gradle.org/m2/" }
7171
}
7272
dependencies{
73-
compileOnly('org.projectlombok:lombok:1.16.6')
73+
compileOnly('org.projectlombok:lombok:1.16.20')
7474
}
7575
buildscript {
7676
repositories {

examples/cloud-eureka-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<artifactId>cloud-eureka-server</artifactId>
7-
<version>1.3.0-RELEASE</version>
7+
<version>1.4.0.RELEASE</version>
88
<packaging>jar</packaging>
99

1010
<name>cloud-eureka-server</name>
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>net.devh</groupId>
1515
<artifactId>examples</artifactId>
16-
<version>1.3.0-RELEASE</version>
16+
<version>1.4.0.RELEASE</version>
1717
</parent>
1818

1919
<properties>

examples/cloud-grpc-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<artifactId>cloud-grpc-client</artifactId>
7-
<version>1.3.0-RELEASE</version>
7+
<version>1.4.0.RELEASE</version>
88
<packaging>jar</packaging>
99

1010
<name>cloud-grpc-client</name>
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>net.devh</groupId>
1515
<artifactId>examples</artifactId>
16-
<version>1.3.0-RELEASE</version>
16+
<version>1.4.0.RELEASE</version>
1717
</parent>
1818

1919
<properties>

examples/cloud-grpc-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<artifactId>cloud-grpc-server</artifactId>
7-
<version>1.3.0-RELEASE</version>
7+
<version>1.4.0.RELEASE</version>
88
<packaging>jar</packaging>
99

1010
<name>cloud-grpc-server</name>
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>net.devh</groupId>
1515
<artifactId>examples</artifactId>
16-
<version>1.3.0-RELEASE</version>
16+
<version>1.4.0.RELEASE</version>
1717
</parent>
1818

1919
<properties>

examples/cloud-zipkin-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<artifactId>cloud-zipkin-server</artifactId>
7-
<version>1.3.0-RELEASE</version>
7+
<version>1.4.0.RELEASE</version>
88
<packaging>jar</packaging>
99

1010
<name>cloud-zipkin-server</name>
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>net.devh</groupId>
1515
<artifactId>examples</artifactId>
16-
<version>1.3.0-RELEASE</version>
16+
<version>1.4.0.RELEASE</version>
1717
</parent>
1818

1919
<properties>

examples/grpc-lib/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>examples</artifactId>
77
<groupId>net.devh</groupId>
8-
<version>1.3.0-RELEASE</version>
8+
<version>1.4.0.RELEASE</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

examples/local-grpc-client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<artifactId>local-grpc-client</artifactId>
7-
<version>1.3.0-RELEASE</version>
7+
<version>1.4.0.RELEASE</version>
88
<packaging>jar</packaging>
99

1010
<name>local-grpc-client</name>
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>net.devh</groupId>
1515
<artifactId>examples</artifactId>
16-
<version>1.3.0-RELEASE</version>
16+
<version>1.4.0.RELEASE</version>
1717
</parent>
1818

1919
<properties>
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>net.devh</groupId>
3232
<artifactId>grpc-lib</artifactId>
33-
<version>1.3.0-RELEASE</version>
33+
<version>1.4.0.RELEASE</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>net.devh</groupId>

examples/local-grpc-server/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55

66
<artifactId>local-grpc-server</artifactId>
7-
<version>1.3.0-RELEASE</version>
7+
<version>1.4.0.RELEASE</version>
88
<packaging>jar</packaging>
99

1010
<name>local-grpc-server</name>
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>net.devh</groupId>
1515
<artifactId>examples</artifactId>
16-
<version>1.3.0-RELEASE</version>
16+
<version>1.4.0.RELEASE</version>
1717
</parent>
1818

1919
<properties>

0 commit comments

Comments
 (0)