This is an automated email from the ASF dual-hosted git repository.
totalo 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 e73a233e166 Use netty-bom (#28823)
e73a233e166 is described below
commit e73a233e1661273efcf318cdff58b9914fed9978
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Oct 21 10:35:37 2023 +0800
Use netty-bom (#28823)
* Use netty-bom
* Use netty-bom
---
kernel/data-pipeline/scenario/cdc/client/pom.xml | 4 +-
pom.xml | 84 ++----------------------
proxy/frontend/core/pom.xml | 2 +
3 files changed, 8 insertions(+), 82 deletions(-)
diff --git a/kernel/data-pipeline/scenario/cdc/client/pom.xml
b/kernel/data-pipeline/scenario/cdc/client/pom.xml
index 76bd4c1fcb8..a2b6f193354 100644
--- a/kernel/data-pipeline/scenario/cdc/client/pom.xml
+++ b/kernel/data-pipeline/scenario/cdc/client/pom.xml
@@ -32,16 +32,16 @@
<artifactId>shardingsphere-data-pipeline-cdc-protocol</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
- <version>${netty.version}</version>
</dependency>
+
<dependency>
<groupId>org.opengauss</groupId>
<artifactId>opengauss-jdbc</artifactId>
diff --git a/pom.xml b/pom.xml
index 01de5ee7b0f..3d6c936bc9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,8 +87,7 @@
<calcite.version>1.35.0</calcite.version>
<immutables.version>2.9.3</immutables.version>
- <netty.version>4.1.99.Final</netty.version>
- <netty-tcnative.version>2.0.62.Final</netty-tcnative.version>
+ <netty.version>4.1.100.Final</netty.version>
<bouncycastle.version>1.70</bouncycastle.version>
<javax.transaction.version>1.1</javax.transaction.version>
@@ -306,77 +305,10 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
+ <artifactId>netty-bom</artifactId>
<version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-socks</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-classes-epoll</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>${netty.version}</version>
- <classifier>linux-x86_64</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>${netty.version}</version>
- <classifier>linux-aarch_64</classifier>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>${netty-tcnative.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
@@ -389,10 +321,6 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
<exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- </exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
@@ -427,10 +355,6 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
-
<artifactId>netty-transport-native-unix-common</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/proxy/frontend/core/pom.xml b/proxy/frontend/core/pom.xml
index 95d2074394c..c4b5b4244af 100644
--- a/proxy/frontend/core/pom.xml
+++ b/proxy/frontend/core/pom.xml
@@ -83,11 +83,13 @@
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-x86_64</classifier>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-aarch_64</classifier>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
