You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2021/10/28 07:34:42 UTC
[nifi] branch main updated: NIFI-9342 Upgraded to Netty 3.10.6 and
4.1.69
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 60d6d46 NIFI-9342 Upgraded to Netty 3.10.6 and 4.1.69
60d6d46 is described below
commit 60d6d469bff511c8a890209ef60f58034792a5f6
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Wed Oct 27 20:52:59 2021 -0500
NIFI-9342 Upgraded to Netty 3.10.6 and 4.1.69
- Replaced Netty 3.6.9 and 3.7.1 with 3.10.6
- Replaced Netty 4.1 with 4.1.69
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5490.
---
nifi-commons/nifi-security-socket-ssl/pom.xml | 2 +-
nifi-external/nifi-spark-receiver/pom.xml | 5 +++
nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 11 ++++++
nifi-nar-bundles/nifi-druid-bundle/pom.xml | 17 +++++++++
.../nifi-elasticsearch-5-processors/pom.xml | 16 +++++++++
.../nifi-elasticsearch-processors/pom.xml | 6 ++++
.../nifi-event-transport/pom.xml | 2 +-
.../nifi-extension-utils/nifi-record-utils/pom.xml | 7 ++--
nifi-nar-bundles/nifi-flume-bundle/pom.xml | 12 +++++++
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 3 +-
.../nifi-graph-test-clients/pom.xml | 6 ++++
.../nifi-other-graph-services/pom.xml | 6 ++++
nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 ++++
.../nifi-hadoop-libraries-bundle/pom.xml | 3 +-
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 19 ++++++++--
nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 3 +-
nifi-nar-bundles/nifi-kite-bundle/pom.xml | 3 +-
nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 3 +-
nifi-nar-bundles/nifi-riemann-bundle/pom.xml | 3 +-
nifi-nar-bundles/nifi-solr-bundle/pom.xml | 41 ++++++++++++++++++++++
nifi-nar-bundles/nifi-spark-bundle/pom.xml | 3 +-
.../nifi-distributed-cache-client-service/pom.xml | 2 +-
.../nifi-hbase_1_1_2-client-service-bundle/pom.xml | 3 +-
.../nifi-hbase_2-client-service-bundle/pom.xml | 3 +-
.../nifi-registry-aws-extensions/pom.xml | 11 ++++++
nifi-toolkit/pom.xml | 3 +-
pom.xml | 2 ++
27 files changed, 172 insertions(+), 29 deletions(-)
diff --git a/nifi-commons/nifi-security-socket-ssl/pom.xml b/nifi-commons/nifi-security-socket-ssl/pom.xml
index a18b608..4890c6a 100644
--- a/nifi-commons/nifi-security-socket-ssl/pom.xml
+++ b/nifi-commons/nifi-security-socket-ssl/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.65.Final</version>
+ <version>${netty.4.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml
index c829705..97b5f74 100644
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi-external/nifi-spark-receiver/pom.xml
@@ -48,6 +48,11 @@
<artifactId>zookeeper</artifactId>
<version>3.4.14</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.3.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index fc51c7f..863d30d 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -85,6 +85,17 @@
<artifactId>commons-compress</artifactId>
<version>1.21</version>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
index 912e6d3..d193312 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
@@ -90,6 +90,23 @@
<artifactId>zookeeper</artifactId>
<version>3.4.14</version>
</dependency>
+ <!-- Override Netty 3 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.3.version}</version>
+ </dependency>
+ <!-- Override Netty Transport 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
index a1c61c3..ec2e0fc 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
@@ -93,6 +93,22 @@ language governing permissions and limitations under the License. -->
<artifactId>nifi-ssl-context-service</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
index 6499376..fa0157b 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
@@ -138,6 +138,12 @@ language governing permissions and limitations under the License. -->
<artifactId>nifi-standard-record-utils</artifactId>
<version>1.15.0-SNAPSHOT</version>
</dependency>
+ <!-- Override Netty 3 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.3.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
index ab008d2..b2591e8 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
@@ -26,7 +26,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.63.Final</version>
+ <version>${netty.4.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
index e592ff6..ddb6d21 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
@@ -26,17 +26,16 @@
<modules>
<module>nifi-avro-record-utils</module>
<module>nifi-standard-record-utils</module>
- <module>nifi-hadoop-record-utils</module>
- <module>nifi-mock-record-utils</module>
+ <module>nifi-hadoop-record-utils</module>
+ <module>nifi-mock-record-utils</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
- <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override commons-compress -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
index 4f1c127..2eae3ab 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
@@ -35,6 +35,18 @@
<artifactId>nifi-flume-processors</artifactId>
<version>1.15.0-SNAPSHOT</version>
</dependency>
+ <!-- Override Netty 3 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.3.version}</version>
+ </dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index e17c8a1..bbea33e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -647,10 +647,9 @@
<version>3.6</version>
</dependency>
<dependency>
- <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
index 52e9b52..923462a 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
@@ -114,5 +114,11 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
index 765bfac..a4c1364 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
@@ -118,6 +118,12 @@
<artifactId>gremlin-driver</artifactId>
<version>${gremlin.version}</version>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml b/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
index 98a8a94..22b8753 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
@@ -39,6 +39,12 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
index 0f568bf..ff999d4 100644
--- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
@@ -29,10 +29,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override commons-io:2.5 from hadoop libraries -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index 359274d..ea814a5 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -40,10 +40,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override snapshot versions of javax.el -->
<dependency>
@@ -111,6 +110,22 @@
<artifactId>zookeeper</artifactId>
<version>3.4.14</version>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
index 8d1e099..2009a2b 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
@@ -86,10 +86,9 @@
<version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
- <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-kite-bundle/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/pom.xml
index 29340d3..13d6338 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kite-bundle/pom.xml
@@ -39,10 +39,9 @@
<version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
- <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.6.9.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override commons-io:2.4 from kite -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml
index 82c2026..22b1c77 100644
--- a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml
@@ -32,12 +32,11 @@
<module>nifi-parquet-nar</module>
</modules>
<dependencyManagement>
- <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.6.9.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override commons-io:2.5 -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-riemann-bundle/pom.xml b/nifi-nar-bundles/nifi-riemann-bundle/pom.xml
index 1b66a7e..4093b09 100644
--- a/nifi-nar-bundles/nifi-riemann-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-riemann-bundle/pom.xml
@@ -45,10 +45,9 @@
<version>1.15.0-SNAPSHOT</version>
</dependency>
<dependency>
- <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.6.9.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-solr-bundle/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/pom.xml
index 4e4c2ba..53b6ae2 100644
--- a/nifi-nar-bundles/nifi-solr-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-solr-bundle/pom.xml
@@ -35,6 +35,47 @@
<artifactId>commons-io</artifactId>
<version>2.10.0</version>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
index dc81d7e..d25b7f1 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
@@ -59,10 +59,9 @@
<version>1.19.1</version>
</dependency>
<dependency>
- <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override zookeeper -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
index e8455ad..95c8c11 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.65.Final</version>
+ <version>${netty.4.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
index 02c402b..e426076 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
@@ -83,10 +83,9 @@
<version>${hadoop.version}</version>
</dependency>
<dependency>
- <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.6.9.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override commons-io:2.4 from hbase-client -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
index 02c80d4..50da742 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml
@@ -53,10 +53,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.6.9.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
<!-- Override commons-io:2.4 from hbase-client -->
<dependency>
diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
index fb40e58..e2fcf55 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
@@ -48,6 +48,17 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Override Netty 4 -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.4.version}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/nifi-toolkit/pom.xml b/nifi-toolkit/pom.xml
index 651fc71..b27b6e9 100644
--- a/nifi-toolkit/pom.xml
+++ b/nifi-toolkit/pom.xml
@@ -53,10 +53,9 @@
</exclusions>
</dependency>
<dependency>
- <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.7.1.Final</version>
+ <version>${netty.3.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 2d4a4d3..c5639f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,8 @@
<jersey.version>2.33</jersey.version>
<logback.version>1.2.6</logback.version>
<mockito.version>3.11.2</mockito.version>
+ <netty.3.version>3.10.6.Final</netty.3.version>
+ <netty.4.version>4.1.69.Final</netty.4.version>
</properties>
<repositories>