diff --git a/pom.xml b/pom.xml
index 5fe188d6e560e88d8892a03fa9c9eb375771a03d..a6b624540c84478f508327fe0f842ce829aff3f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,7 +305,8 @@
 							<excludePackageNames>*.internal.*</excludePackageNames>
 							<overview>src/api/overview.html</overview>
 							<additionalJOptions>
-								<additionalJOption>-J-Duser.language=en -J-Duser.country=US</additionalJOption>
+								<additionalJOption>-J-Duser.language=en</additionalJOption>
+								<additionalJOption>-J-Duser.country=US</additionalJOption>
 							</additionalJOptions>
 						</configuration>
 					</plugin>
@@ -428,5 +429,25 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>above-jdk9</id>
+			<activation>
+				<jdk>[9,)</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<additionalJOptions>
+								<additionalJOption>-html5</additionalJOption>
+								<additionalJOption>-J-Duser.language=en</additionalJOption>
+								<additionalJOption>-J-Duser.country=US</additionalJOption>
+							</additionalJOptions>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
diff --git a/pom4ide.xml b/pom4ide.xml
index dd07bd0d5d2930a6d55a21d46c647887a6160044..6fcdc65d92a7a4770e61455d144cff7cd4b9cbe5 100644
--- a/pom4ide.xml
+++ b/pom4ide.xml
@@ -305,7 +305,8 @@
 							<excludePackageNames>*.internal.*</excludePackageNames>
 							<overview>src/api/overview.html</overview>
 							<additionalJOptions>
-								<additionalJOption>-J-Duser.language=en -J-Duser.country=US</additionalJOption>
+								<additionalJOption>-J-Duser.language=en</additionalJOption>
+								<additionalJOption>-J-Duser.country=US</additionalJOption>
 							</additionalJOptions>
 						</configuration>
 					</plugin>
@@ -428,5 +429,25 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>above-jdk9</id>
+			<activation>
+				<jdk>[9,)</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<additionalJOptions>
+								<additionalJOption>-html5</additionalJOption>
+								<additionalJOption>-J-Duser.language=en</additionalJOption>
+								<additionalJOption>-J-Duser.country=US</additionalJOption>
+							</additionalJOptions>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
diff --git a/scripts/integration-test.sh b/scripts/integration-test.sh
index 3f07383b4817b493b13b04cba78a3ae9607837b7..b200af9bbf7e4e3a0e9872516db26bdd7efbcc85 100755
--- a/scripts/integration-test.sh
+++ b/scripts/integration-test.sh
@@ -9,18 +9,18 @@ source ./common.sh skipClean
 #   - JAVA9_HOME
 #   - JAVA10_HOME
 
-# Java 8
-if [ -n "$JAVA8_HOME" ]; then
-    export JAVA_HOME="${JAVA8_HOME}"
+# Java 10
+if [ -n "$JAVA10_HOME" ]; then
+    export JAVA_HOME="${JAVA10_HOME}"
 else
-    current_java_version=$(./mvn -v | awk -F'[ ,]' '/^Java version/{print $3}')
-    if [[ default_java_version != "1.8."* ]]; then
-        echo "Fail to get java 8 home!"
+    current_java_version=$(./mvnw -v | awk -F'[ ,]' '/^Java version/{print $3}')
+    if [[ default_java_version != 10.* ]]; then
+        echo "Fail to get java 10 home!"
         exit 1
     fi
 fi
 
-headInfo "test with Java 8"
+headInfo "test with Java 10"
 runCmd ./mvnw clean install --batch-mode
 runCmd ./scripts/run-agent-test.sh
 
@@ -44,6 +44,16 @@ else
     headInfo "skip Java 7 test"
 fi
 
+# Java 8
+if [ -n "$JAVA8_HOME" ]; then
+    headInfo "test with Java 8"
+    export JAVA_HOME="${JAVA8_HOME}"
+    runCmd ./scripts/run-junit.sh skipClean
+    runCmd ./scripts/run-agent-test.sh skipClean
+else
+    headInfo "skip Java 8 test"
+fi
+
 # Java 9
 if [ -n "$JAVA9_HOME" ]; then
     headInfo "test with Java 9"
@@ -54,12 +64,12 @@ else
     headInfo "skip Java 9 test"
 fi
 
-# Java 10
-if [ -n "$JAVA10_HOME" ]; then
-    headInfo "test with Java 10"
-    export JAVA_HOME="${JAVA10_HOME}"
+# Java 11
+if [ -n "$JAVA9_HOME" ]; then
+    headInfo "test with Java 11"
+    export JAVA_HOME="${JAVA9_HOME}"
     runCmd ./scripts/run-junit.sh skipClean
     runCmd ./scripts/run-agent-test.sh skipClean
 else
-    headInfo "skip Java 10 test"
+    headInfo "skip Java 11 test"
 fi
diff --git a/src/api/overview.html b/src/api/overview.html
index 84af79c0523138e6f8fa74cf3f4ebd0f0a34bdc0..3c7960e9a39a9af7d6c5baa2feb78fdc8dfaacf3 100644
--- a/src/api/overview.html
+++ b/src/api/overview.html
@@ -2,7 +2,7 @@
 <body>
 <p>This is the API documentation for the
     <a href="https://github.com/alibaba/transmittable-thread-local" target="_top">TransmittableThreadLocal(TTL)</a>,
-    The missing std Java™ lib(simple & 0-dependency) for framework/middleware,
+    The missing std Java™ lib(simple &amp; 0-dependency) for framework/middleware,
     transmitting ThreadLocal value between threads even using thread pooling components.
 </p>
 </body>