From 8d7c0bede103077410e6e561e09d8205762a0f13 Mon Sep 17 00:00:00 2001
From: Bryan Beaudreault <bbeaudreault@hubspot.com>
Date: Wed, 25 Jan 2023 09:53:14 -0500
Subject: [PATCH] HBASE-27592 Update hadoop netty version for hadoop-2.0
 profile

---
 pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index bbaf0dd5aa0d..091ff4ae61e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -556,8 +556,9 @@
     <compat.module>hbase-hadoop2-compat</compat.module>
     <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
     <!--This property is for hadoops netty. HBase netty
-         comes in via hbase-thirdparty hbase-shaded-netty-->
-    <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
+         comes in via hbase-thirdparty hbase-shaded-netty.
+         Note this is overridden by hadoop-specific profiles below. -->
+    <netty.hadoop.version>3.10.6.Final</netty.hadoop.version>
     <!-- end HBASE-15925 default hadoop compatibility values -->
     <audience-annotations.version>0.13.0</audience-annotations.version>
     <!--
@@ -3172,7 +3173,7 @@
         <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
         <!--This property is for hadoops netty. HBase netty
              comes in via hbase-thirdparty hbase-shaded-netty-->
-        <netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
+        <netty.hadoop.version>3.10.6.Final</netty.hadoop.version>
       </properties>
       <dependencyManagement>
         <dependencies>