This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 8e1af30cc61 Use grpc-bom and protobuf-bom (#28825)
8e1af30cc61 is described below
commit 8e1af30cc61799df37490ce641963da94222d98c
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Oct 21 11:48:56 2023 +0800
Use grpc-bom and protobuf-bom (#28825)
* Use grpc-bom and protobuf-bom
* Use grpc-bom and protobuf-bom
* downgrade netty version
---
kernel/data-pipeline/scenario/cdc/protocol/pom.xml | 2 +-
pom.xml | 67 +++++++---------------
2 files changed, 23 insertions(+), 46 deletions(-)
diff --git a/kernel/data-pipeline/scenario/cdc/protocol/pom.xml
b/kernel/data-pipeline/scenario/cdc/protocol/pom.xml
index 126c15664f9..4336a7aa68f 100644
--- a/kernel/data-pipeline/scenario/cdc/protocol/pom.xml
+++ b/kernel/data-pipeline/scenario/cdc/protocol/pom.xml
@@ -46,7 +46,7 @@
<additionalProtoPathElements>
<additionalProtoPathElement>${project.basedir}/src/main/resources</additionalProtoPathElement>
</additionalProtoPathElements>
-
<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 6a1e4845de0..78bccfc5349 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,15 +87,16 @@
<calcite.version>1.35.0</calcite.version>
<immutables.version>2.9.3</immutables.version>
- <netty.version>4.1.100.Final</netty.version>
<bouncycastle.version>1.70</bouncycastle.version>
<javax.transaction.version>1.1</javax.transaction.version>
+ <netty.version>4.1.99.Final</netty.version>
<zookeeper.version>3.9.0</zookeeper.version>
<curator.version>5.5.0</curator.version>
<jetcd.version>0.7.6</jetcd.version>
<grpc.version>1.58.0</grpc.version>
+ <protobuf.version>3.21.12</protobuf.version>
<elasticjob.version>3.0.4</elasticjob.version>
@@ -120,8 +121,6 @@
<mockito.version>4.11.0</mockito.version>
<awaitility.version>4.2.0</awaitility.version>
- <protobuf-java.version>3.21.12</protobuf-java.version>
-
<!-- 3rd party library plugin versions -->
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
@@ -290,6 +289,12 @@
<version>${immutables.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>${javax.transaction.version}</version>
+ </dependency>
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
@@ -297,12 +302,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>${javax.transaction.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
@@ -346,28 +345,23 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
- <artifactId>grpc-core</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <version>${grpc.version}</version>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
+ <artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-grpclb</artifactId>
- <version>${grpc.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-bom</artifactId>
+ <version>${protobuf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -409,23 +403,6 @@
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf-java.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java-util</artifactId>
- <version>${protobuf-java.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.j2objc</groupId>
- <artifactId>j2objc-annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
