diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index 65042aad50b5..9db9e5267035 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -51,9 +51,8 @@
         <configuration>
           <archive>
             <manifest>
-              <!--Include the Driver class as the 'main'.
-                   Executing the jar will then show a list of the basic MR jobs.
-                   -->
+              <!--Include the Driver class as the 'main'. Executing the jar will then show a
+                list of the basic MR jobs.-->
               <mainClass>org/apache/hadoop/hbase/mapreduce/Driver</mainClass>
             </manifest>
           </archive>
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 760208f4b863..ac7c4a75e436 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1343,7 +1343,7 @@ You can redistribute it and/or modify it under either the terms of the
 ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
 ##
 ## NB: This list is later compared as lower-case. New entries must also be all lower-case
-#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5' ])
+#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'apache-2.0' ])
 ## include LICENSE sections for anything not under ASL2.0
 #foreach( ${dep} in ${projects} )
 ## if there are no licenses we'll fail the build later, so
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 858835749b9a..953ea0fe2614 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -36,8 +36,7 @@
     <license.bundles.jquery>true</license.bundles.jquery>
   </properties>
   <build>
-    <!-- Make sure resources get added before they are processed
-      by placing this first
+    <!-- Make sure resources get added before they are processed by placing this first
      -->
     <resources>
       <!-- Add the build webabpps to the classpth -->
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 7c78d1892242..f62d9ef409b5 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -520,6 +520,8 @@
                       <!-- We already concat NOTICE, safe to drop individual ones -->
                       <exclude>LICENSE</exclude>
                       <exclude>NOTICE</exclude>
+                      <!-- Remove the shaded guava added in hadoop-3.3.1+-->
+                      <exclude>org/apache/hadoop/thirdparty/**/*</exclude>
                     </excludes>
                   </filter>
                   <filter>