add java10 build support

- add -html5 option for javadoc under java9+ - integration-test.sh use java 10 build

add java10 build support
- add -html5 option for javadoc under java9+ - integration-test.sh use java 10 build
8ffb3fb0 · oldratlee · 2d92de48 · 8ffb3fb0 · 8ffb3fb0 · 8ffb3fb0
隐藏空白更改
内联并排

Showing with 67 addition and 15 deletion

pom.xml pom.xml +22 -1

pom4ide.xml pom4ide.xml +22 -1

scripts/integration-test.sh scripts/integration-test.sh +22 -12

src/api/overview.html src/api/overview.html +1 -1

未找到文件。
--- 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>
--- 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>
--- 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
--- 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>