diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index e208017c9a8d..49096c4751e6 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -59,8 +59,8 @@ pipeline {
     ASF_NIGHTLIES_BASE_ORI = "${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}"
     ASF_NIGHTLIES_BASE = "${ASF_NIGHTLIES_BASE_ORI.replaceAll(' ', '%20')}"
     // These are dependent on the branch
-    HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0"
-    HADOOP3_DEFAULT_VERSION = "3.3.5"
+    HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1"
+    HADOOP3_DEFAULT_VERSION = "3.4.1"
   }
   parameters {
     booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, description: '''Check to use the current HEAD of apache/yetus rather than our configured release.
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index afa1a9f50cf9..2069632708cd 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1478,7 +1478,8 @@ ${dep.scm.url}
 #if( ${dep.licenses[0].name.contains("CDDL")} )
 #if( ${dep.licenses[0].name.contains("1.0")} )
 #set($aggregated = $cddl_1_0.add($dep))
-#elseif( ${dep.licenses[0].name.contains("1.1")} )
+#elseif( ${dep.licenses[0].name.contains("1.1")}
+  || ${dep.licenses[0].name.contains("CDDL+GPL")} )
 #set($aggregated = $cddl_1_1.add($dep))
 #end
 #end
diff --git a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
index f9fc294cc992..0ca7ecc58175 100644
--- a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+++ b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
@@ -108,6 +108,8 @@ if [ -n "${allow_hadoop}" ]; then
   allowed_expr+="|^[^-]*-version-info.properties$"
   #   * Hadoop's application classloader properties file.
   allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
+  #   * Comes from dnssecjava via Hadoop
+  allowed_expr+="|^messages.properties$"
 else
   # We have some classes for integrating with the Hadoop Metrics2 system
   # that have to be in a particular package space due to access rules.
diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
index f9fc294cc992..0ca7ecc58175 100644
--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
@@ -108,6 +108,8 @@ if [ -n "${allow_hadoop}" ]; then
   allowed_expr+="|^[^-]*-version-info.properties$"
   #   * Hadoop's application classloader properties file.
   allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
+  #   * Comes from dnssecjava via Hadoop
+  allowed_expr+="|^messages.properties$"
 else
   # We have some classes for integrating with the Hadoop Metrics2 system
   # that have to be in a particular package space due to access rules.
diff --git a/pom.xml b/pom.xml
index 65c74b7c4a57..bd652b3a1896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -548,7 +548,7 @@
     <java.min.version>${compileSource}</java.min.version>
     <!-- Dependencies -->
     <hadoop-two.version>2.10.2</hadoop-two.version>
-    <hadoop-three.version>3.3.5</hadoop-three.version>
+    <hadoop-three.version>3.4.1</hadoop-three.version>
     <!-- These must be defined here for downstream build tools that don't look at profiles.
          They ought to match the values found in our default hadoop profile, which is
          currently "hadoop-2.0". See HBASE-15925 for more info. -->