Skip to content

Commit 9c864a7

Browse files
zrlwzrlw
authored
Bump grpc,protoc to latest version (#1286)
* Bump grpc,protoc to latest version * Add version configuration to protobuf-java dependencies * Bump dubbo to 3.3.7-SNAPSHOT for using new Dubbo3TripleGenerator with protobuf-java 4.33.4
1 parent d47b698 commit 9c864a7

27 files changed

Lines changed: 95 additions & 65 deletions

File tree

  • 1-basic
  • 10-task/dubbo-samples-benchmark
  • 2-advanced
    • dubbo-samples-migration
      • dubbo-samples-migration-case-application
        • dubbo-samples-migration-case-application-consumer
        • dubbo-samples-migration-case-application-provider
      • dubbo-samples-migration-case-default
        • dubbo-samples-migration-case-default-consumer
        • dubbo-samples-migration-case-default-provider
    • dubbo-samples-native-image-registry
      • dubbo-samples-native-image-registry-consumer
      • dubbo-samples-native-image-registry-provider
    • dubbo-samples-native-image
      • dubbo-samples-native-image-consumer
      • dubbo-samples-native-image-provider
    • dubbo-samples-triple-grpc
    • dubbo-samples-triple-http3
    • dubbo-samples-triple-no-idl
    • dubbo-samples-triple-servlet
    • dubbo-samples-triple-streaming
  • 3-extensions
    • protocol/dubbo-samples-triple
    • registry
      • dubbo-samples-mesh-k8s
      • dubbo-samples-xds
    • serialization

‎1-basic/dubbo-samples-api-idl/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
<maven.compiler.target>17</maven.compiler.target>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737

38-
<dubbo.version>3.3.1</dubbo.version>
39-
<protobuf-java.version>3.19.6</protobuf-java.version>
40-
<protoc.version>3.22.3</protoc.version>
38+
<dubbo.version>3.3.7-SNAPSHOT</dubbo.version>
39+
<!-- protoc version should be same with protobuf-java version -->
40+
<protobuf-java.version>4.33.4</protobuf-java.version>
41+
<protoc.version>4.33.4</protoc.version>
4142
<log4j2.version>2.20.0</log4j2.version>
4243
</properties>
4344

‎1-basic/dubbo-samples-spring-boot-idl/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@
4040
<maven.compiler.target>17</maven.compiler.target>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242

43-
<dubbo.version>3.3.1</dubbo.version>
43+
<dubbo.version>3.3.7-SNAPSHOT</dubbo.version>
4444
<spring-boot.version>3.2.3</spring-boot.version>
45-
<protobuf-java.version>3.19.6</protobuf-java.version>
46-
<protoc.version>3.22.3</protoc.version>
45+
<!-- protoc version should be same with protobuf-java version -->
46+
<protobuf-java.version>4.33.4</protobuf-java.version>
47+
<protoc.version>4.33.4</protoc.version>
4748
</properties>
4849

4950
<modules>

‎10-task/dubbo-samples-benchmark/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<maven.compiler.source>1.8</maven.compiler.source>
4444
<maven.compiler.target>1.8</maven.compiler.target>
4545
<jmh.version>1.37</jmh.version>
46+
<protobuf-java.version>4.33.4</protobuf-java.version>
4647
</properties>
4748

4849
<modules>
@@ -107,7 +108,7 @@
107108
<dependency>
108109
<groupId>com.google.protobuf</groupId>
109110
<artifactId>protobuf-java</artifactId>
110-
<version>4.26.0</version>
111+
<version>${protobuf-java.version}</version>
111112
</dependency>
112113

113114
<!--fastjson-->

‎2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<junit.version>4.13.1</junit.version>
3737

3838
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
39+
<protobuf-java.version>4.33.4</protobuf-java.version>
3940
</properties>
4041

4142
<dependencyManagement>
@@ -86,6 +87,7 @@
8687
<dependency>
8788
<groupId>com.google.protobuf</groupId>
8889
<artifactId>protobuf-java</artifactId>
90+
<version>${protobuf-java.version}</version>
8991
</dependency>
9092

9193
<dependency>

‎2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<junit.version>4.13.1</junit.version>
3737

3838
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
39+
<protobuf-java.version>4.33.4</protobuf-java.version>
3940
</properties>
4041

4142
<dependencyManagement>
@@ -72,21 +73,22 @@
7273
</dependencyManagement>
7374

7475
<dependencies>
75-
<dependency>
76-
<groupId>org.apache.dubbo</groupId>
77-
<artifactId>dubbo</artifactId>
78-
</dependency>
76+
<dependency>
77+
<groupId>org.apache.dubbo</groupId>
78+
<artifactId>dubbo</artifactId>
79+
</dependency>
7980

80-
<dependency>
81-
<groupId>org.springframework</groupId>
82-
<artifactId>spring-context-support</artifactId>
83-
<version>${spring.version}</version>
84-
</dependency>
81+
<dependency>
82+
<groupId>org.springframework</groupId>
83+
<artifactId>spring-context-support</artifactId>
84+
<version>${spring.version}</version>
85+
</dependency>
8586

86-
<dependency>
87-
<groupId>com.google.protobuf</groupId>
88-
<artifactId>protobuf-java</artifactId>
89-
</dependency>
87+
<dependency>
88+
<groupId>com.google.protobuf</groupId>
89+
<artifactId>protobuf-java</artifactId>
90+
<version>${protobuf-java.version}</version>
91+
</dependency>
9092
<dependency>
9193
<groupId>org.apache.curator</groupId>
9294
<artifactId>curator-x-discovery</artifactId>

‎2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<junit.version>4.13.1</junit.version>
3636

3737
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
38+
<protobuf-java.version>4.33.4</protobuf-java.version>
3839
</properties>
3940

4041
<dependencyManagement>
@@ -106,8 +107,9 @@
106107
</dependency>
107108

108109
<dependency>
109-
<groupId>com.google.protobuf</groupId>
110-
<artifactId>protobuf-java</artifactId>
110+
<groupId>com.google.protobuf</groupId>
111+
<artifactId>protobuf-java</artifactId>
112+
<version>${protobuf-java.version}</version>
111113
</dependency>
112114

113115
<dependency>

‎2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<junit.version>4.13.1</junit.version>
3636

3737
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
38+
<protobuf-java.version>4.33.4</protobuf-java.version>
3839
</properties>
3940

4041
<dependencyManagement>
@@ -75,8 +76,9 @@
7576
</dependency>
7677

7778
<dependency>
78-
<groupId>com.google.protobuf</groupId>
79-
<artifactId>protobuf-java</artifactId>
79+
<groupId>com.google.protobuf</groupId>
80+
<artifactId>protobuf-java</artifactId>
81+
<version>${protobuf-java.version}</version>
8082
</dependency>
8183

8284
<dependency>

‎2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-consumer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<dubbo.version>3.3.1</dubbo.version>
3838
<spring-boot.version>3.2.2</spring-boot.version>
39-
<protobuf-java.version>3.19.6</protobuf-java.version>
39+
<protobuf-java.version>4.33.4</protobuf-java.version>
4040

4141
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
4242
<native-maven-plugin.version>0.10.1</native-maven-plugin.version>

‎2-advanced/dubbo-samples-native-image-registry/dubbo-samples-native-image-registry-provider/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<dubbo.version>3.3.1</dubbo.version>
3838
<spring-boot.version>3.2.2</spring-boot.version>
39-
<protobuf-java.version>3.19.6</protobuf-java.version>
39+
<protobuf-java.version>4.33.4</protobuf-java.version>
4040

4141
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
4242
<native-maven-plugin.version>0.10.1</native-maven-plugin.version>

‎2-advanced/dubbo-samples-native-image/dubbo-samples-native-image-consumer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<dubbo.version>3.3.1</dubbo.version>
3939
<spring-boot.version>3.2.3</spring-boot.version>
40-
<protobuf-java.version>3.19.6</protobuf-java.version>
40+
<protobuf-java.version>4.33.4</protobuf-java.version>
4141

4242
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
4343
<native-maven-plugin.version>0.9.28</native-maven-plugin.version>

0 commit comments

Comments
 (0)