From 3f870c72dea30dd4078081a97404d3f412043699 Mon Sep 17 00:00:00 2001
From: shamsulazeem <shamsazeem20@gmail.com>
Date: Thu, 18 Feb 2021 17:25:51 +0800
Subject: [PATCH] Consolidating netty versions

Signed-off-by: shamsulazeem <shamsazeem20@gmail.com>
---
 datavec/datavec-data/datavec-hadoop/pom.xml            | 2 +-
 deeplearning4j/deeplearning4j-modelexport-solr/pom.xml | 2 +-
 pom.xml                                                | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/datavec/datavec-data/datavec-hadoop/pom.xml b/datavec/datavec-data/datavec-hadoop/pom.xml
index 6587f5535..118ea131e 100644
--- a/datavec/datavec-data/datavec-hadoop/pom.xml
+++ b/datavec/datavec-data/datavec-hadoop/pom.xml
@@ -37,7 +37,7 @@
 
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
+            <artifactId>netty-all</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
diff --git a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
index 87cf5e476..bcbbd3755 100644
--- a/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
+++ b/deeplearning4j/deeplearning4j-modelexport-solr/pom.xml
@@ -83,7 +83,7 @@
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
+            <artifactId>netty-all</artifactId>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
diff --git a/pom.xml b/pom.xml
index 9fc8503a6..e352fa5e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,11 +417,6 @@
                 <artifactId>netty-all</artifactId>
                 <version>${netty.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty</artifactId>
-                <version>3.10.6.Final</version>
-            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-buffer</artifactId>