File tree Expand file tree Collapse file tree 1 file changed +2
-9
lines changed Expand file tree Collapse file tree 1 file changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -23,15 +23,6 @@ cd ${scriptDir}/..
2323# include common functions
2424source ${scriptDir} /common.sh
2525
26- # Kokoro integration test uses both JDK 11 and JDK 8. Integration
27- # tests require JDK 11 to compile the classes.
28- if [ -n " ${JAVA11_HOME} " && ! -n " ${JAVA8_HOME} " ]; then
29- setJava " ${JAVA11_HOME} "
30- echo " Java:${JAVA} "
31- echo " Java 11:${JAVA11_HOME} "
32- echo " Java 8:${JAVA8_HOME} "
33- fi
34-
3526# Print out Maven & Java version
3627mvn -version
3728echo ${JOB_TYPE}
@@ -69,6 +60,8 @@ javadoc)
6960 RETURN_CODE=$?
7061 ;;
7162integration)
63+ # Kokoro integration test uses both JDK 11 and JDK 8. Integration
64+ # tests require JDK 11 to compile the classes.
7265 if [ -n " ${JAVA11_HOME} " ] && [ -n " ${JAVA8_HOME} " ]; then
7366 export JAVA=${JAVA11_HOME} /bin/java
7467 export SUREFIRE_JVM_OPT=" -Djvm=${JAVA8_HOME} /bin/java"
You can’t perform that action at this time.
0 commit comments