chore: simplify integration-test.sh since use java 8

Author: oldratlee

appveyor.yml

@@ -59,12 +59,12 @@ for:
       - cmd: echo JAVA_HOME=%JAVA_HOME%, HOMEPATH=%HOMEPATH%, PATH=%PATH%
 
     test_script:
-      # test under java 8
-      - cmd: set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
-      - ./mvnw.cmd -V clean install --no-transfer-progress
       # test under java 11
       - cmd: set JAVA_HOME=C:\Program Files\Java\jdk11
-      - ./mvnw.cmd -V clean install --no-transfer-progress
+      - ./mvnw.cmd -V --no-transfer-progress clean install
+      # test under java 8
+      - cmd: set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
+      - ./mvnw.cmd -V --no-transfer-progress surefire:test
 
     after_test:
       - ps: Remove-Item -r -fo $home\.m2\repository\com\alibaba\dns-cache-manipulator*

library/pom.xml

@@ -533,6 +533,21 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>add-java-open-options-for-jdk17</id>
+			<activation>
+				<jdk>[17,)</jdk>
+			</activation>
+			<!--
+				Maven Surefire Plugin – surefire:test
+					https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#argLine
+				Append the value of argLine param in maven-surefire-plugin
+					https://stackoverflow.com/questions/46489455
+			-->
+			<properties>
+				<argLine>--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/sun.net=ALL-UNNAMED</argLine>
+			</properties>
+		</profile>
 		<profile>
 			<id>gen-code-cov</id>
 			<build>

library/scripts/lib_common_build.sh

@@ -35,64 +35,23 @@ JAVA_CMD() {
     )
 
     logAndRun "$JAVA_HOME/bin/java" -Xmx128m -Xms128m -server -ea -Duser.language=en -Duser.country=US \
-    ${ENABLE_JAVA_RUN_VERBOSE_CLASS+ -verbose:class} \
-    ${ENABLE_JAVA_RUN_DEBUG+ -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005} \
-    ${additionalOptionsForJava12Plus[@]:+"${additionalOptionsForJava12Plus[@]}"} \
-    "$@"
+        ${ENABLE_JAVA_RUN_VERBOSE_CLASS+ -verbose:class} \
+        ${ENABLE_JAVA_RUN_DEBUG+ -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005} \
+        ${additionalOptionsForJava12Plus[@]:+"${additionalOptionsForJava12Plus[@]}"} \
+        "$@"
 }
 
 #################################################################################
 # maven operation functions
 #################################################################################
 
-
 MVN_CMD() {
-    logAndRun "$ROOT_PROJECT_DIR/mvnw" -V --no-transfer-progress "$@"
-}
-
-mvnClean() {
-    checkNecessityForCallerFunction || return 0
-
     (
         cd "$ROOT_PROJECT_DIR"
-        MVN_CMD clean || die "fail to mvn clean!"
-    )
-}
 
-mvnBuildJar() {
-    checkNecessityForCallerFunction || return 0
-
-    (
-        cd "$ROOT_PROJECT_DIR"
-        if [ -n "${CI_TEST_MODE+YES}" ]; then
-            # Build jar action should have used package instead of install
-            # here use install intended to check release operations.
-            #
-            # De-activate a maven profile from command line
-            # https://stackoverflow.com/questions/25201430
-            MVN_CMD install -DperformRelease -P '!gen-sign' || die "fail to build jar!"
-        else
-            MVN_CMD install -Dmaven.test.skip=true || die "fail to build jar!"
-        fi
-    )
-}
-
-mvnCompileTest() {
-    checkNecessityForCallerFunction || return 0
-
-    (
-        cd "$ROOT_PROJECT_DIR"
-        MVN_CMD test-compile || die "fail to compile test!"
-    )
-}
-
-mvnCopyDependencies() {
-    checkNecessityForCallerFunction || return 0
-
-    (
-        cd "$ROOT_PROJECT_DIR"
-        # https://maven.apache.org/plugins/maven-dependency-plugin/copy-dependencies-mojo.html
-        MVN_CMD dependency:copy-dependencies -DincludeScope=test -DexcludeArtifactIds=jsr305,spotbugs-annotations || die "fail to mvn copy-dependencies!"
+        logAndRun "$ROOT_PROJECT_DIR/mvnw" -V --no-transfer-progress \
+            ${SKIP_GIT_DIRTY_CHECK+ -Dgit.dirty=false} \
+            "$@"
     )
 }
 

library/scripts/run-junit.sh

@@ -12,19 +12,25 @@ source ./common_build.sh
 switch_to_jdk 11
 
 if [ "${1:-}" != "skipClean" ]; then
-    mvnClean
-
-    mvnBuildJar
-
-    mvnCopyDependencies
+    MVN_CMD clean
 fi
 
+# Build jar action should have used package instead of install
+# here use install intended to check release operations.
+#
+# De-activate a maven profile from command line
+# https://stackoverflow.com/questions/25201430
+headInfo "test with Java: $JAVA_HOME"
+MVN_CMD -DperformRelease -P '!gen-sign' install
+
 # test multi-version java home env
 # shellcheck disable=SC2154
 for jhome in "${java_home_var_names[@]}"; do
+    # already tested by above `mvn install`
+    [ "JDK11_HOME" = "$jhome" ] && continue
+
     export JAVA_HOME=${!jhome}
 
     headInfo "test with Java: $JAVA_HOME"
-    logAndRun ../library/scripts/run-junit.sh skipClean
-    logAndRun ../tool/scripts/run-junit.sh skipClean
+    MVN_CMD surefire:test
 done