Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <thenatog@gmail.com>

This closes #5635.
This commit is contained in:
exceptionfactory 2022-01-05 15:39:49 -06:00 committed by Nathan Gough
parent b0b1a57b98
commit 12ba579b8f
16 changed files with 8 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
View File

@ -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>

5
minifi/pom.xml
View File

@ -855,11 +855,6 @@ limitations under the License.
<artifactId>spark-streaming_2.10</artifactId>
<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>

1
nifi-commons/nifi-security-socket-ssl/pom.xml
View File

@ -40,7 +40,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.4.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

11
nifi-nar-bundles/nifi-atlas-bundle/pom.xml
View File

@ -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>

11
nifi-nar-bundles/nifi-druid-bundle/pom.xml
View File

@ -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>

16
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
View File

@ -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>

1
nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-flume-bundle/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
View File

@ -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>

16
nifi-nar-bundles/nifi-hive-bundle/pom.xml
View File

@ -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>

41
nifi-nar-bundles/nifi-solr-bundle/pom.xml
View File

@ -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>

1
nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
View File

@ -62,7 +62,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.4.version}</version>
</dependency>
</dependencies>
</project>

11
nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml
View File

@ -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>

9
pom.xml
View File

@ -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>
@ -496,6 +496,13 @@
<scope>import</scope>
<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>