diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 68a75a9f34a0..ee76a5463ab1 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -588,9 +588,9 @@ function hadoopcheck_rebuild
   fi
   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.3 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
 
   export MAVEN_OPTS="${MAVEN_OPTS}"
diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc
index 7f2c5f67eb63..2c314509e55d 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -315,14 +315,15 @@ link:https://hadoop.apache.org/cve_list.html[CVEs] so we drop the support in new
 
 .Hadoop version support matrix for active release lines
 
-[cols="1,2*^.^", options="header"]
+[cols="1,3*^.^", options="header"]
 |===
-| | HBase-2.3.x | HBase-2.4.x
-|Hadoop-2.10.x | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.1.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"]
-|Hadoop-3.1.1+ | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.2.x | icon:check-circle[role="green"] | icon:check-circle[role="green"]
-|Hadoop-3.3.x | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+| | 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"]
+|Hadoop-3.1.[0-3] | icon:times-circle[role="red"] | icon:times-circle[role="red"] | icon:times-circle[role="red"]
+|Hadoop-3.1.4+ | 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"]
+|Hadoop-3.2.2+ | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
+|Hadoop-3.3.x | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"]
 |===
 
 .Hadoop version support matrix for EOM 2.x release lines
@@ -409,6 +410,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]
 ====