diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
index 9be9c5addde..99a0afd7b4c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcDetailedMetrics.java
@@ -66,7 +66,7 @@ public class RpcDetailedMetrics {
 
   /**
    * Add an RPC processing time sample
-   * @param name  of the RPC call
+   * @param metName of the RPC call
    * @param processingTime  the processing time
    */
   //@Override // some instrumentation interface
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
index cde180bd1e0..eb147ca47ee 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
@@ -293,7 +293,7 @@ public class LogThrottlingHelper {
    * suppressed in the provided log action. If no statements were suppressed,
    * this returns an empty string. The message has the format (without quotes):
    *
-   * <p/>' (suppressed logging <i>{suppression_count}</i> times)'
+   * <p>' (suppressed logging <i>{suppression_count}</i> times)'</p>
    *
    * @param action The log action to produce a message about.
    * @return A message about suppression within this action.
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index cbc12c3c5a3..05a35bd7c0b 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -2014,8 +2014,7 @@
       </dependencyManagement>
     </profile>
     <profile>
-      <!-- TODO: remove this profile to generate html5 docs when we stop supporting JDK8 -->
-      <id>javadoc-html-version</id>
+      <id>jdk11</id>
       <activation>
         <jdk>[11,)</jdk>
       </activation>
@@ -2026,7 +2025,10 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
               <additionalOptions>
+                <!-- TODO: remove -html4 option to generate html5 docs when we stop supporting JDK8 -->
                 <additionalOption>-html4</additionalOption>
+                <additionalOption>--add-exports</additionalOption>
+                <additionalOption>java.naming/com.sun.jndi.ldap=ALL-UNNAMED</additionalOption>
               </additionalOptions>
             </configuration>
           </plugin>