This is an automated email from the ASF dual-hosted git repository.
panjuan 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 022d58d Replace netty-all with specified modules (#13255)
022d58d is described below
commit 022d58d456ac6bcd8a0e0bc52aacf3726d5e7d50
Author: 吴伟杰 <[email protected]>
AuthorDate: Mon Oct 25 17:21:52 2021 +0800
Replace netty-all with specified modules (#13255)
* Replace netty-all with specified modules
* Remove exclusions in proxy-bootstrap
* Update LICENSE for Netty in distribution
* Remove exclusions for curator-client
* Update LICENSE for scaling distribution
---
pom.xml | 67 +++++++++++++++++++---
.../shardingsphere-agent-metrics-api/pom.xml | 6 --
.../shardingsphere-agent-tracing-test/pom.xml | 1 +
.../shardingsphere-db-protocol-core/pom.xml | 2 +-
.../src/main/release-docs/LICENSE | 15 ++++-
.../src/main/release-docs/LICENSE | 10 +++-
.../shardingsphere-proxy-bootstrap/pom.xml | 42 --------------
.../shardingsphere-proxy-frontend-core/pom.xml | 16 +++++-
.../shardingsphere-proxy-frontend-mysql/pom.xml | 5 --
.../pom.xml | 5 --
.../shardingsphere-proxy-frontend-spi/pom.xml | 5 --
.../shardingsphere-scaling-bootstrap/pom.xml | 2 +-
.../shardingsphere-scaling-mysql/pom.xml | 4 --
13 files changed, 101 insertions(+), 79 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7ef19fe..9fb4455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,10 +199,69 @@
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <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>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-transport</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-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>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
@@ -293,12 +352,6 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml
index b67c1e6..1ed6d44 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/pom.xml
@@ -42,12 +42,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-scaling-distsql-statement</artifactId>
<version>${project.version}</version>
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
index 6f68988..5123fc4 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-test/pom.xml
@@ -32,6 +32,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-proxy-frontend-core</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-core/pom.xml
b/shardingsphere-db-protocol/shardingsphere-db-protocol-core/pom.xml
index 082c4f2..a20d560 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-core/pom.xml
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-core/pom.xml
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <artifactId>netty-codec</artifactId>
</dependency>
</dependencies>
</project>
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
index 56ef8af..a5def05 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
@@ -264,7 +264,20 @@ The text of each license is the standard Apache 2.0
license.
listenablefuture
9999.0-empty-to-avoid-conflict-with-guava:https://github.com/google/guava,
Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
- netty-all 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-buffer 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-codec 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http2 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-codec-socks 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-common 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-handler 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-handler-proxy 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-resolver 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-transport 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.69.Final: https://github.com/netty,
Apache 2.0
+ netty-transport-native-epoll 4.1.69.Final-linux-aarch_64:
https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.69.Final-linux-x86_64:
https://github.com/netty, Apache 2.0
+ netty-transport-native-unix-common 4.1.69.Final: https://github.com/netty,
Apache 2.0
opentracing-api 0.30.0: https://opentracing.io, Apache 2.0
opentracing-noop 0.30.0: https://opentracing.io, Apache 2.0
opentracing-util 0.30.0: https://opentracing.io, Apache 2.0
diff --git
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/release-docs/LICENSE
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/release-docs/LICENSE
index e138265..2913524 100644
---
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/release-docs/LICENSE
+++
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/release-docs/LICENSE
@@ -252,7 +252,15 @@ The text of each license is the standard Apache 2.0
license.
listenablefuture
9999.0-empty-to-avoid-conflict-with-guava:https://github.com/google/guava,
Apache 2.0
log4j 1.2.17: http://logging.apache.org/log4j/1.2/, Apache 2.0
memory 0.9.0, Apache 2.0
- netty-all 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-buffer 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-codec 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-codec-http 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-common 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-handler 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-resolver 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-transport 4.1.69.Final: https://github.com/netty, Apache 2.0
+ netty-transport-native-epoll 4.1.69.Final: https://github.com/netty,
Apache 2.0
+ netty-transport-native-unix-common 4.1.69.Final: https://github.com/netty,
Apache 2.0
quartz 2.3.2: https://github.com/quartz-scheduler/quartz, Apache 2.0
sketches-core 0.9.0, Apache 2.0
snakeyaml 1.16: http://www.snakeyaml.org, Apache 2.0
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml
index 9f40447..761a661 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/pom.xml
@@ -91,48 +91,6 @@
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-cluster-mode-repository-etcd</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-socks</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/pom.xml
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/pom.xml
index a32ec09..f8a4c77 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/pom.xml
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/pom.xml
@@ -45,7 +45,21 @@
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <artifactId>netty-handler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <classifier>linux-x86_64</classifier>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <classifier>linux-aarch_64</classifier>
</dependency>
</dependencies>
</project>
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/pom.xml
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/pom.xml
index ccd30a3..9f7d69a 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/pom.xml
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/pom.xml
@@ -47,10 +47,5 @@
<artifactId>shardingsphere-proxy-backend</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
</project>
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml
index b066fab..c8a35ee 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/pom.xml
@@ -47,11 +47,6 @@
<artifactId>shardingsphere-proxy-backend</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
<profiles>
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-spi/pom.xml
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-spi/pom.xml
index 0740173..cdeb895 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-spi/pom.xml
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-spi/pom.xml
@@ -37,10 +37,5 @@
<artifactId>shardingsphere-proxy-backend</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/pom.xml
b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/pom.xml
index 4ce7829..aaf1414 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/pom.xml
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <artifactId>netty-codec-http</artifactId>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
index 2135ee2..f3c4cec 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
+++
b/shardingsphere-scaling/shardingsphere-scaling-dialect/shardingsphere-scaling-mysql/pom.xml
@@ -41,10 +41,6 @@
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </dependency>
- <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<scope>compile</scope>
