This is an automated email from the ASF dual-hosted git repository.
thenatog 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 12ba579 NIFI-9539 Upgraded Netty from 4.1.69 to 4.1.72
12ba579 is described below
commit 12ba579b8f6c506288458fb6cd2191ea26da2cb3
Author: exceptionfactory <[email protected]>
AuthorDate: Wed Jan 5 15:39:49 2022 -0600
NIFI-9539 Upgraded Netty from 4.1.69 to 4.1.72
- Added Netty 4 BOM to root Maven configuration
- Removed individual Netty 4 dependency overrides
- Removed commented dependencies and unnecessary declarations from MiNiFi
Signed-off-by: Nathan Gough <[email protected]>
This closes #5635.
---
.../minifi-server-nar/pom.xml | 36 -------------------
minifi/pom.xml | 5 ---
nifi-commons/nifi-security-socket-ssl/pom.xml | 1 -
nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 11 ------
nifi-nar-bundles/nifi-druid-bundle/pom.xml | 11 ------
.../nifi-elasticsearch-5-processors/pom.xml | 16 ---------
.../nifi-event-transport/pom.xml | 1 -
nifi-nar-bundles/nifi-flume-bundle/pom.xml | 6 ----
.../nifi-graph-test-clients/pom.xml | 6 ----
.../nifi-other-graph-services/pom.xml | 6 ----
nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 6 ----
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 16 ---------
nifi-nar-bundles/nifi-solr-bundle/pom.xml | 41 ----------------------
.../nifi-distributed-cache-client-service/pom.xml | 1 -
.../nifi-registry-aws-extensions/pom.xml | 11 ------
pom.xml | 9 ++++-
16 files changed, 8 insertions(+), 175 deletions(-)
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
index 8689071..9348a9c 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
@@ -43,42 +43,6 @@
<artifactId>nifi-headless-server</artifactId>
<version>1.16.0-SNAPSHOT</version>
</dependency>
- <!--<dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-core-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-nar-utils</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-authorization</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-cluster</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-cluster-protocol</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-web-utils</artifactId>
- <scope>provided</scope>
- </dependency>-->
-
<!-- mark these nifi artifacts as provided since it is included in the
lib -->
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index e288dad..a73c3a0 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -856,11 +856,6 @@ limitations under the License.
<version>1.6.0</version>
</dependency>
<dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.5.5</version>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
diff --git a/nifi-commons/nifi-security-socket-ssl/pom.xml
b/nifi-commons/nifi-security-socket-ssl/pom.xml
index 2e11473..996f07a 100644
--- a/nifi-commons/nifi-security-socket-ssl/pom.xml
+++ b/nifi-commons/nifi-security-socket-ssl/pom.xml
@@ -40,7 +40,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>${netty.4.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index f583927..987a3fb 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -86,17 +86,6 @@
<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 6d3922e..fcc34be 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
@@ -168,17 +168,6 @@
<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 d98b33d..6f48720 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
@@ -91,22 +91,6 @@ 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-extension-utils/nifi-event-transport/pom.xml
b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
index 35053c4..3491cca 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,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>${netty.4.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/pom.xml
b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
index 747cb31..45fc06d 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
@@ -41,12 +41,6 @@
<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-graph-bundle/nifi-graph-test-clients/pom.xml
b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
index 0b3afed..582e75f 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
@@ -124,11 +124,5 @@
<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 11fde8a..8081e21 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,12 +118,6 @@
<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 cbd6c1b..d1debeb 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
@@ -39,12 +39,6 @@
<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-hive-bundle/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index 0a478e2..472b0a1 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -102,22 +102,6 @@
<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-solr-bundle/pom.xml
b/nifi-nar-bundles/nifi-solr-bundle/pom.xml
index 61aaec2..4bae4cc 100644
--- a/nifi-nar-bundles/nifi-solr-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-solr-bundle/pom.xml
@@ -35,47 +35,6 @@
<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-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 08c9ee8..bb19c31 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,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>${netty.4.version}</version>
</dependency>
</dependencies>
</project>
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 b47e991..f3dc7af 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
@@ -58,17 +58,6 @@
<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/pom.xml b/pom.xml
index 2a589e7..2e6af91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<logback.version>1.2.9</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>
+ <netty.4.version>4.1.72.Final</netty.4.version>
<spring.version>5.3.14</spring.version>
<spring.security.version>5.6.1</spring.security.version>
</properties>
@@ -497,6 +497,13 @@
<type>pom</type>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>${netty.4.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version>
