NIFI-5665 - Changed netty versions to more closely match the original netty dependency version.

NIFI-5665 - Fixed version for nifi-spark-bundle.
NIFI-5665 - Fixing copy and paste error.

This closes #3067

nifi-nar-bundles/nifi-atlas-bundle/pom.xml

@@ -36,6 +36,12 @@
 
     <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>
+            </dependency>
             <dependency>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nifi-atlas-reporting-task</artifactId>

nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml

@@ -30,4 +30,14 @@
 	<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>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>

nifi-nar-bundles/nifi-framework-bundle/pom.xml

@@ -601,6 +601,12 @@
                 <artifactId>commons-net</artifactId>
                 <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>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml

@@ -26,4 +26,14 @@
     <modules>
         <module>nifi-hadoop-libraries-nar</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>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>

nifi-nar-bundles/nifi-hive-bundle/pom.xml

@@ -35,6 +35,17 @@
         <module>nifi-hive3-nar</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>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <properties>
         <hive.version>1.2.1</hive.version>
         <hive.hadoop.version>2.6.2</hive.hadoop.version>

nifi-nar-bundles/nifi-kafka-bundle/pom.xml

@@ -77,6 +77,12 @@
                 <artifactId>nifi-kafka-2-0-processors</artifactId>
                 <version>1.8.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>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

nifi-nar-bundles/nifi-kite-bundle/pom.xml

@@ -38,6 +38,12 @@
                 <artifactId>nifi-kite-processors</artifactId>
                 <version>1.8.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>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml

@@ -82,7 +82,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>

nifi-nar-bundles/nifi-parquet-bundle/pom.xml

@@ -31,5 +31,14 @@
         <module>nifi-parquet-processors</module>
         <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>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>

nifi-nar-bundles/nifi-riemann-bundle/pom.xml

@@ -44,6 +44,12 @@
                 <artifactId>nifi-riemann-processors</artifactId>
                 <version>1.8.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>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

nifi-nar-bundles/nifi-spark-bundle/pom.xml

@@ -63,6 +63,12 @@
                 <artifactId>jersey-client</artifactId>
                 <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>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -81,6 +87,5 @@
             <artifactId>nifi-processor-utils</artifactId>
             <version>1.8.0-SNAPSHOT</version>
         </dependency>
-
     </dependencies>
 </project>

nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml

@@ -82,6 +82,12 @@
                 <artifactId>hadoop-auth</artifactId>
                 <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>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

nifi-toolkit/pom.xml

@@ -47,7 +47,14 @@
                     </exclusion>
                 </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>
+            </dependency>
         </dependencies>
+
     </dependencyManagement>
     <dependencies>
         <dependency>