From 7cef7109de0982e4e8d16b43706036e97d862bd8 Mon Sep 17 00:00:00 2001
From: Surendra Singh Lilhore <surendralilhore@apache.org>
Date: Thu, 14 May 2020 15:09:34 +0530
Subject: [PATCH] YARN-10265. Upgrade Netty-all dependency to latest version
 4.1.50 to fix ARM support issue. Contributed by liusheng

---
 .../hadoop-hdfs-client/pom.xml                |  2 +-
 hadoop-hdfs-project/hadoop-hdfs/pom.xml       |  2 +-
 hadoop-project/pom.xml                        | 20 ++-----------------
 .../hadoop-yarn/hadoop-yarn-csi/pom.xml       |  2 +-
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
index 0ab7d5b7bcd..f783131c953 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
@@ -64,7 +64,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${netty4.group}</groupId>
+      <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 090a85e9cb1..4de50c27398 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -176,7 +176,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>${netty4.group}</groupId>
+      <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
       <scope>compile</scope>
     </dependency>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index d07bac32575..5260cc85eb5 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -140,8 +140,7 @@
     <htrace4.version>4.1.0-incubating</htrace4.version>
     <metrics.version>3.2.4</metrics.version>
     <netty3.version>3.10.6.Final</netty3.version>
-    <netty4.version>4.1.48.Final</netty4.version>
-    <netty4.group>io.netty</netty4.group>
+    <netty4.version>4.1.50.Final</netty4.version>
 
     <!-- Maven protoc compiler -->
     <protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
@@ -893,7 +892,7 @@
       </dependency>
 
       <dependency>
-        <groupId>${netty4.group}</groupId>
+        <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
         <version>${netty4.version}</version>
       </dependency>
@@ -2216,21 +2215,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>aarch64</id>
-      <properties>
-        <!-- To make hadoop fully support ARM64 now, here add a workaround using an unofficial
-        netty-all package which support ARM64. Once the Netty officially support ARM64 in a
-        new release, we need to remove this and upgrade to use Netty official package -->
-        <netty4.group>org.openlabtesting.netty</netty4.group>
-      </properties>
-      <activation>
-        <os>
-          <family>linux</family>
-          <arch>aarch64</arch>
-        </os>
-      </activation>
-    </profile>
     <profile>
       <id>test-patch</id>
       <activation>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
index 0cedd8e8a69..a6d26fcbbb5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
@@ -44,7 +44,7 @@
             <version>${protobuf.version}</version>
         </dependency>
         <dependency>
-            <groupId>${netty4.group}</groupId>
+            <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>
         <dependency>