diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 29dcba3a58c35..7306ec1d4f5a2 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -346,9 +346,23 @@ The Apache Software License, Version 2.0
- org.apache.commons-commons-compress-1.15.jar
- org.apache.commons-commons-lang3-3.4.jar
* Netty
- - io.netty-netty-3.10.1.Final.jar
- - io.netty-netty-all-4.1.32.Final.jar
- - io.netty-netty-tcnative-boringssl-static-2.0.20.Final.jar
+ - io.netty-netty-buffer-4.1.43.Final.jar
+ - io.netty-netty-codec-4.1.43.Final.jar
+ - io.netty-netty-codec-dns-4.1.43.Final.jar
+ - io.netty-netty-codec-http-4.1.43.Final.jar
+ - io.netty-netty-codec-http2-4.1.43.Final.jar
+ - io.netty-netty-codec-socks-4.1.43.Final.jar
+ - io.netty-netty-common-4.1.43.Final.jar
+ - io.netty-netty-handler-4.1.43.Final.jar
+ - io.netty-netty-handler-proxy-4.1.43.Final.jar
+ - io.netty-netty-resolver-4.1.43.Final.jar
+ - io.netty-netty-resolver-dns-4.1.43.Final.jar
+ - io.netty-netty-transport-4.1.43.Final.jar
+ - io.netty-netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar
+ - io.netty-netty-transport-native-epoll-4.1.43.Final.jar
+ - io.netty-netty-transport-native-unix-common-4.1.43.Final.jar
+ - io.netty-netty-3.10.6.Final.jar
+ - io.netty-netty-tcnative-boringssl-static-2.0.26.Final.jar
* Prometheus client
- io.prometheus-simpleclient-0.5.0.jar
- io.prometheus-simpleclient_common-0.5.0.jar
diff --git a/distribution/server/src/assemble/bin.xml b/distribution/server/src/assemble/bin.xml
index bb3e2736cc338..2247641fc4232 100644
--- a/distribution/server/src/assemble/bin.xml
+++ b/distribution/server/src/assemble/bin.xml
@@ -115,22 +115,6 @@
${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-
- io.netty:netty-buffer
- io.netty:netty-common
- io.netty:netty-codec
- io.netty:netty-codec-dns
- io.netty:netty-codec-http
- io.netty:netty-codec-http2
- io.netty:netty-codec-socks
- io.netty:netty-handler
- io.netty:netty-handler-proxy
- io.netty:netty-resolver
- io.netty:netty-resolver-dns
- io.netty:netty-transport
- io.netty:netty-transport-native-epoll
- io.netty:netty-transport-native-unix-common
-
org.apache.pulsar:pulsar-functions-runtime-all
diff --git a/pom.xml b/pom.xml
index 7c73e96a46c9c..78648348be13e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,8 @@ flexible messaging model and an intuitive client API.
4.9.2
3.4.13
- 4.1.32.Final
+ 4.1.43.Final
+ 2.0.26.Final
2.0.0
9.4.12.v20180830
2.27
@@ -430,7 +431,43 @@ flexible messaging model and an intuitive client API.
io.netty
- netty-all
+ netty-buffer
+ ${netty.version}
+
+
+
+ io.netty
+ netty-common
+ ${netty.version}
+
+
+
+ io.netty
+ netty-transport
+ ${netty.version}
+
+
+
+ io.netty
+ netty-handler
+ ${netty.version}
+
+
+
+ io.netty
+ netty-codec
+ ${netty.version}
+
+
+
+ io.netty
+ netty-transport-native-epoll
+ ${netty.version}
+
+
+
+ io.netty
+ netty-transport-native-unix-common
${netty.version}
@@ -442,16 +479,52 @@ flexible messaging model and an intuitive client API.
${netty.version}
+
+ io.netty
+ netty-codec-http
+ ${netty.version}
+
+
+
+ io.netty
+ netty-handler-proxy
+ ${netty.version}
+
+
+
+ io.netty
+ netty-codec-socks
+ ${netty.version}
+
+
+
+ io.netty
+ netty-resolver
+ ${netty.version}
+
+
+
+ io.netty
+ netty-resolver-dns
+ ${netty.version}
+
+
+
+ io.netty
+ netty-codec-dns
+ ${netty.version}
+
+
io.netty
netty-tcnative-boringssl-static
- 2.0.20.Final
+ ${netty-tc-native.version}
io.netty
netty
- 3.10.1.Final
+ 3.10.6.Final
@@ -1084,30 +1157,6 @@ flexible messaging model and an intuitive client API.
log4j
log4j
-
- org.jboss.netty
- netty
-
-
- io.netty
- netty-common
-
-
- io.netty
- netty-buffer
-
-
- io.netty
- netty-handler
-
-
- io.netty
- netty-transport-native-epoll
-
-
- io.netty
- netty-tcnative-boringssl-static
-
com.fasterxml.jackson.core
*
diff --git a/pulsar-broker-shaded/pom.xml b/pulsar-broker-shaded/pom.xml
index f89cb5cf89c90..a5a694c6e6409 100644
--- a/pulsar-broker-shaded/pom.xml
+++ b/pulsar-broker-shaded/pom.xml
@@ -65,16 +65,12 @@
commons-*:*
org.apache.commons:*
org.asynchttpclient:*
-
- io.netty:netty-codec-http
- io.netty:netty-transport-native-epoll
org.reactivestreams:reactive-streams
com.typesafe.netty:netty-reactive-streams
org.javassist:javassist
com.google.*:*
com.fasterxml.jackson.*:*
- io.netty:netty
- io.netty:netty-all
+ io.netty:*
org.apache.pulsar:pulsar-common
org.apache.bookkeeper:circe-checksum
com.yahoo.datasketches:sketches-core
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 1452d423253af..1d95b1b4c1a8f 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -56,7 +56,7 @@
io.netty
- netty-all
+ netty-transport
diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
index cb136e537aa24..c395cc0641eb2 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -63,8 +63,6 @@
commons-codec:commons-codec
commons-collections:commons-collections
org.asynchttpclient:*
- io.netty:netty-codec-http
- io.netty:netty-transport-native-epoll
org.reactivestreams:reactive-streams
com.typesafe.netty:netty-reactive-streams
org.javassist:javassist
@@ -72,8 +70,7 @@
com.google.guava:guava
com.google.code.gson:gson
com.fasterxml.jackson.core
- io.netty:netty
- io.netty:netty-all
+ io.netty:*
org.apache.pulsar:pulsar-common
org.apache.bookkeeper:circe-checksum
com.yahoo.datasketches:sketches-core
@@ -84,7 +81,6 @@
com.fasterxml.jackson.*:*
io.grpc:*
com.yahoo.datasketches:*
- io.netty:*
com.squareup.*:*
com.google.*:*
commons-*:*
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index 720e642beff14..0f5a9e2bffd5a 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -117,9 +117,7 @@
com.fasterxml.jackson.module
com.fasterxml.jackson.core:jackson-core
com.fasterxml.jackson.dataformat
- io.netty:netty
- io.netty:netty-all
- io.netty:netty-tcnative-boringssl-static
+ io.netty:*
org.eclipse.jetty:*
com.yahoo.datasketches:*
commons-*:*
diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
index bfc76d5c6f981..a55bd74c2efc7 100644
--- a/pulsar-client/pom.xml
+++ b/pulsar-client/pom.xml
@@ -44,6 +44,16 @@
${project.parent.version}
+
+ io.netty
+ netty-codec-http
+
+
+
+ io.netty
+ netty-resolver-dns
+
+
org.apache.commons
commons-lang3
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 081a6429aff9c..157591cf86524 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -75,7 +75,17 @@
io.netty
- netty-all
+ netty-handler
+
+
+
+ io.netty
+ netty-transport-native-epoll
+
+
+
+ io.netty
+ netty-transport-native-unix-common
diff --git a/pulsar-functions/localrun/pom.xml b/pulsar-functions/localrun/pom.xml
index 8ae10ba1026e4..a5875dba9c127 100644
--- a/pulsar-functions/localrun/pom.xml
+++ b/pulsar-functions/localrun/pom.xml
@@ -60,11 +60,6 @@
${project.parent.version}
-
- io.netty
- netty-all
-
-
io.grpc
grpc-all
diff --git a/pulsar-functions/utils/pom.xml b/pulsar-functions/utils/pom.xml
index c93db8067d94b..30307cb4558fd 100644
--- a/pulsar-functions/utils/pom.xml
+++ b/pulsar-functions/utils/pom.xml
@@ -32,12 +32,6 @@
Pulsar Functions :: Utils
-
-
- io.netty
- netty-all
-
-
org.apache.pulsar
pulsar-common
diff --git a/pulsar-functions/worker-shaded/pom.xml b/pulsar-functions/worker-shaded/pom.xml
index eedb3a6590e44..669fe6115db47 100644
--- a/pulsar-functions/worker-shaded/pom.xml
+++ b/pulsar-functions/worker-shaded/pom.xml
@@ -49,34 +49,6 @@
org.apache.pulsar
pulsar-client-admin-shaded-for-functions
-
- io.netty
- netty-common
-
-
- io.netty
- netty-codec
-
-
- io.netty
- netty-codec-http
-
-
- io.netty
- netty-codec-http2
-
-
- io.netty
- netty-handler-proxy
-
-
- io.netty
- netty-handler
-
-
- io.netty
- netty-buffer
-
@@ -84,12 +56,6 @@
org.apache.bookkeeper
bookkeeper-server-shaded
-
-
- io.netty
- netty-all
-
-
diff --git a/pulsar-io/kinesis/pom.xml b/pulsar-io/kinesis/pom.xml
index 3607ac3eef2f1..d89f1e0bf3a4f 100644
--- a/pulsar-io/kinesis/pom.xml
+++ b/pulsar-io/kinesis/pom.xml
@@ -45,11 +45,6 @@
provided
-
- io.netty
- netty-all
-
-
org.apache.commons
commons-lang3
diff --git a/pulsar-io/netty/pom.xml b/pulsar-io/netty/pom.xml
index 49c304ee800cd..8cafcbec5a75e 100644
--- a/pulsar-io/netty/pom.xml
+++ b/pulsar-io/netty/pom.xml
@@ -51,8 +51,12 @@
io.netty
- netty-all
- ${netty.version}
+ netty-handler
+
+
+
+ io.netty
+ netty-codec-http
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java
index 0ec4fd3b3e644..fe206be5c692e 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyWithAuthorizationTest.java
@@ -133,7 +133,7 @@ public Object[][] protocolsCiphersProviderCodecProvider() {
return new Object[][] { { ciphers_1, protocols_1, Boolean.FALSE }, { ciphers_2, protocols_2, Boolean.FALSE },
{ ciphers_3, protocols_3, Boolean.TRUE }, { ciphers_4, protocols_4, Boolean.TRUE },
{ ciphers_5, protocols_5, Boolean.TRUE }, { ciphers_6, protocols_6, Boolean.FALSE },
- { ciphers_7, protocols_7, Boolean.TRUE }, { ciphers_8, protocols_8, Boolean.FALSE } };
+ { ciphers_7, protocols_7, Boolean.FALSE }, { ciphers_8, protocols_8, Boolean.FALSE } };
}
@BeforeMethod
diff --git a/pulsar-spark/pom.xml b/pulsar-spark/pom.xml
index 732138592ac68..31dd50c7cfe40 100644
--- a/pulsar-spark/pom.xml
+++ b/pulsar-spark/pom.xml
@@ -84,10 +84,7 @@
com.google.guava:guava
- io.netty:netty-codec-http
- io.netty:netty-transport-native-epoll
- io.netty:netty
- io.netty:netty-all
+ io.netty:netty-*
diff --git a/tiered-storage/file-system/pom.xml b/tiered-storage/file-system/pom.xml
index 0a2051f914681..8ae30d3d96ba3 100644
--- a/tiered-storage/file-system/pom.xml
+++ b/tiered-storage/file-system/pom.xml
@@ -64,6 +64,12 @@
hadoop-minicluster
${hdfs-offload-version3}
test
+
+
+ io.netty
+ netty-all
+
+
org.eclipse.jetty