@@ -131,6 +131,10 @@ function personality_parse_args
131131 delete_parameter " ${i} "
132132 SUREFIRE_SECOND_PART_FORK_COUNT=${i#* =}
133133 ;;
134+ --java8-home=* )
135+ delete_parameter " ${i} "
136+ JAVA8_HOME=${i#* =}
137+ ;;
134138 esac
135139 done
136140}
@@ -560,6 +564,7 @@ function hadoopcheck_rebuild
560564 local result=0
561565 local hbase_hadoop2_versions
562566 local hbase_hadoop3_versions
567+ local savejavahome=${JAVA_HOME}
563568
564569 if [[ " ${repostatus} " = branch ]]; then
565570 return 0
@@ -609,12 +614,18 @@ function hadoopcheck_rebuild
609614 export MAVEN_OPTS=" ${MAVEN_OPTS} "
610615 for hadoopver in ${hbase_hadoop2_versions} ; do
611616 logfile=" ${PATCH_DIR} /patch-javac-${hadoopver} .txt"
617+ # alawys use java8 to build with hadoop 2.x
618+ if [[ -n " ${JAVA8_HOME} " ]]; then
619+ yetus_info " Switching to java 8 for building against hadoop 2.x"
620+ export JAVA_HOME=${JAVA8_HOME}
621+ fi
612622 # disabled because "maven_executor" needs to return both command and args
613623 # shellcheck disable=2046
614624 echo_and_redirect " ${logfile} " \
615625 $( maven_executor) clean install \
616626 -DskipTests -DHBasePatchProcess \
617627 -Dhadoop-two.version=" ${hadoopver} "
628+ export JAVA_HOME=${savejavahome}
618629 count=$( ${GREP} -c ' \[ERROR\]' " ${logfile} " )
619630 if [[ ${count} -gt 0 ]]; then
620631 add_vote_table -1 hadoopcheck " ${BUILDMODEMSG} causes ${count} errors with Hadoop v${hadoopver} ."
0 commit comments