diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml
index 0e79d5a..c9e1834 100644
--- a/htrace-flume/pom.xml
+++ b/htrace-flume/pom.xml
@@ -47,9 +47,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java b/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java
index 199f93d..2a34954 100644
--- a/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java
+++ b/htrace-flume/src/main/java/org/apache/htrace/impl/FlumeSpanReceiver.java
@@ -247,11 +247,9 @@
   }
 
   /**
-   * Close the receiver.
-   * <p/>
-   * This tries to shutdown thread pool.
+   * Close the receiver and shut down the thread pool.
    *
-   * @throws IOException
+   * @throws IOException On error.
    */
   @Override
   public void close() throws IOException {
diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml
index f021dd0..6d9ea28 100644
--- a/htrace-hbase/pom.xml
+++ b/htrace-hbase/pom.xml
@@ -102,9 +102,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -242,6 +239,12 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>doclint-disable</id>
+      <activation><jdk>[1.8,)</jdk></activation>
+      <properties>
+         <additionalparam>-Xdoclint:none</additionalparam>
+      </properties>
+    </profile>
   </profiles>
-
 </project>
diff --git a/htrace-htraced/pom.xml b/htrace-htraced/pom.xml
index 1724953..b67af6d 100644
--- a/htrace-htraced/pom.xml
+++ b/htrace-htraced/pom.xml
@@ -39,9 +39,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml
index f9ceeb5..66659ff 100644
--- a/htrace-zipkin/pom.xml
+++ b/htrace-zipkin/pom.xml
@@ -48,9 +48,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
-        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -218,6 +215,12 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>doclint-disable</id>
+      <activation><jdk>[1.8,)</jdk></activation>
+      <properties>
+         <additionalparam>-Xdoclint:none</additionalparam>
+      </properties>
+    </profile>
   </profiles>
-
 </project>