diff --git a/pom.xml b/pom.xml
index c8b3343..21dffdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,20 @@
         </pluginRepository>
     </pluginRepositories>
 
+
     <profiles>
+        <!-- This profile sets an additional parameter for javadoc generation to disables the doclint.
+             It avoids the build fails if formal/syntax errors are found in javadoc comments.
+              The parameter is only understood by jdk 1.8, so we set it only when jdk 1.8 is used -->
+        <profile>
+            <id>disable-java8-doclint</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <properties>
+                <javadoc.opts>-Xdoclint:none</javadoc.opts>
+            </properties>
+        </profile>
         <profile>
             <id>generate-distribution-packages</id>
             <activation>
@@ -111,10 +124,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
 			<properties>
-			       <!-- This profile sets an additional parameter for javadoc generation to disables the doclint.
-             It avoids the build fails if formal/syntax errors are found in javadoc comments.
-              The parameter is only understood by jdk 1.8, so we set it only when jdk 1.8 is used -->
-                <javadoc.opts>-Xdoclint:none</javadoc.opts>
                 <java_version>1.8</java_version>
                 <maven.compiler.source>${java_version}</maven.compiler.source>
                 <maven.compiler.target>${java_version}</maven.compiler.target>
@@ -237,10 +246,6 @@
  				</property> 
              </activation> 
 			<properties>
-			       <!-- This profile sets an additional parameter for javadoc generation to disables the doclint.
-             It avoids the build fails if formal/syntax errors are found in javadoc comments.
-              The parameter is only understood by jdk 1.8, so we set it only when jdk 1.8 is used -->
-                <javadoc.opts>-Xdoclint:none</javadoc.opts>
                 <java_version>1.8</java_version>
                 <maven.compiler.source>${java_version}</maven.compiler.source>
                 <maven.compiler.target>${java_version}</maven.compiler.target>
@@ -364,7 +369,6 @@
  				</property> 
              </activation> 
 			<properties>
-                <javadoc.opts>-Xdoclint:none</javadoc.opts>
                 <java_version>11</java_version>
                 <maven.compiler.source>${java_version}</maven.compiler.source>
                 <maven.compiler.target>${java_version}</maven.compiler.target>