diff --git a/pom.xml b/pom.xml
index e3ed58ddc3..56a9511c3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1015,9 +1015,6 @@ limitations under the License.
             <activation>
                 <jdk>[1.8,)</jdk>
             </activation>
-            <properties>
-                <javadoc.opts>-Xdoclint:none</javadoc.opts>
-            </properties>
             <build>
                 <plugins>
                     <!-- only activate for jdk8+ since requires java 8 -->
@@ -1034,6 +1031,13 @@ limitations under the License.
                             </execution>
                         </executions>
                     </plugin>
+		    <plugin>
+		      <groupId>org.apache.maven.plugins</groupId>
+		      <artifactId>maven-javadoc-plugin</artifactId>
+		      <configuration combine.self="override">
+			<doclint>none</doclint>
+		      </configuration>
+		    </plugin>
                 </plugins>
             </build>
         </profile>