From 8a71d7c07ae6902bb11b9ab483d409655cceed9d Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Thu, 31 Mar 2022 18:43:17 +0200
Subject: [PATCH] HBASE-26907 Update Hadoop3 versions for JEP 223 compliance

---
 dev-support/hbase-personality.sh              |  4 +--
 pom.xml                                       |  6 +++--
 .../asciidoc/_chapters/configuration.adoc     | 25 +++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index bc04df5dc5b9..d0e76bf58d79 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -660,9 +660,9 @@ function hadoopcheck_rebuild
   else
     yetus_info "Setting Hadoop 3 versions to test based on branch-2.4+/master/feature branch rules"
     if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
-      hbase_hadoop3_versions="3.1.2 3.2.2 3.3.1"
+      hbase_hadoop3_versions="3.1.4 3.2.2 3.3.2"
     else
-      hbase_hadoop3_versions="3.1.1 3.1.2 3.2.0 3.2.1 3.2.2 3.3.0 3.3.1"
+      hbase_hadoop3_versions="3.1.4 3.2.2 3.2.3 3.3.0 3.3.1 3.3.2"
     fi
   fi
 
diff --git a/pom.xml b/pom.xml
index c5c34c0ea1ca..b324c419bf3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -765,7 +765,8 @@
     <maven.min.version>3.0.4</maven.min.version>
     <java.min.version>${compileSource}</java.min.version>
     <!-- Dependencies -->
-    <hadoop-three.version>3.1.2</hadoop-three.version>
+    <!-- We need a minimum HDFS version of 3.1.4 for HADOOP-16703 -->
+    <hadoop-three.version>3.1.4</hadoop-three.version>
     <!-- These must be defined here for downstream build tools that don't look at profiles.
     -->
     <hadoop.version>${hadoop-three.version}</hadoop.version>
@@ -3032,7 +3033,8 @@
         <!-- TODO: replicate logic for windows support -->
         <argLine>--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED ${hbase-surefire.argLine}</argLine>
         <!-- We need a minimum HDFS version of 3.2.0 for HADOOP-12760 -->
-        <hadoop-three.version>3.2.0</hadoop-three.version>
+        <!-- We need a minimum HDFS version of 3.2.2 for HADOOP-16676 -->
+        <hadoop-three.version>3.2.2</hadoop-three.version>
         <!--
           Value to use for surefire when running jdk11.
           TODO: replicate logic for windows
diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc
index 7ed007b58013..cecfe0569473 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -289,14 +289,15 @@ Use the following legend to interpret this table:
 link:https://hadoop.apache.org/cve_list.html[CVEs] so we drop the support in newer minor releases
 * icon:exclamation-circle[role="yellow"] = Not tested, may/may-not function
 
-[cols="1,3*^.^", options="header"]
+[cols="1,4*^.^", options="header"]
 |===
-| | HBase-1.7.x | HBase-2.3.x | HBase-2.4.x
-|Hadoop-2.10.x | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.1.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"] | icon:times-circle[role="red"]
-|Hadoop-3.1.1+ | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.2.x | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.3.x | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+| | HBase-1.7.x | HBase-2.3.x | HBase-2.4.x | HBase-2.5.x
+|Hadoop-2.10.x | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+|Hadoop-3.1.[0-3] | icon:times-circle[role="red"] | icon:times-circle[role="red"] | icon:times-circle[role="red"] | icon:times-circle[role="red"]
+|Hadoop-3.1.4+ | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+|Hadoop-3.2.[0,1] | icon:times-circle[role="red"] | icon:times-circle[role="red"] | icon:times-circle[role="red"] | icon:times-circle[role="red"]
+|Hadoop-3.2.2+ | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+|Hadoop-3.3.x | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
 |===
 
 .Hadoop 2.y.0 Releases
@@ -320,6 +321,16 @@ expressly advises downstream users to avoid running on top of this release. For
 the link:https://s.apache.org/hadoop-3.1.0-announcement[release announcement for Hadoop 3.1.0].
 ====
 
+.Hadoop 3.1.[0-3] and 3.2.[0,1] Releases
+[TIP]
+====
+These versions of Hadoop ship with an older version of Jetty that has an
+link:https://github.com/eclipse/jetty.project/issues/2090[issue] such that it does not support
+link:https://openjdk.java.net/jeps/223[JEP 223] compliant Java version strings. For consistent
+runtime reliability, HBase requires versions of Hadoop that include
+link:https://issues.apache.org/jira/browse/HADOOP-16152[HADOOP-16152].
+====
+
 .Replace the Hadoop Bundled With HBase!
 [NOTE]
 ====