diff --git a/pom.xml b/pom.xml
index 1c3a91f7eb3..27ac3ff581b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,6 +367,9 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.10.4</version>
           <configuration>
+            <charset>UTF-8</charset>
+            <docencoding>UTF-8</docencoding>
+            <encoding>UTF-8</encoding>
             <docfilessubdirs>true</docfilessubdirs>
             <detectLinks>false</detectLinks>
             <detectJavaApiLink>true</detectJavaApiLink>
@@ -1191,6 +1194,18 @@
       <properties>
         <alpn.version>8.1.11.v20170118</alpn.version>
       </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <!-- Required for Java 8u121 or later -->
+              <additionalparam>&#45;&#45;allow-script-in-comments</additionalparam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>
 </project>