From 88534130f9a132ca5926bb3475f02f0f5a899143 Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Wed, 29 Apr 2020 09:25:18 +0200 Subject: [PATCH] HBASE-24280 TestSecureRESTServer started failing in nightlies for Hadoop3 revert to using -Dhadoop.profile --- dev-support/hbase-personality.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 735e133a19..d1e6d827f6 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -146,7 +146,7 @@ function personality_modules fi if [[ -n "${HADOOP_PROFILE}" ]]; then - extra="${extra} -Phadoop-${HADOOP_PROFILE}" + extra="${extra} -Dhadoop.profile=${HADOOP_PROFILE}" fi # BUILDMODE value is 'full' when there is no patch to be tested, and we are running checks on @@ -459,7 +459,7 @@ function shadedjars_rebuild '-Dtest=NoUnitTests' '-DHBasePatchProcess' '-Prelease' '-Dmaven.javadoc.skip=true' '-Dcheckstyle.skip=true' '-Dspotbugs.skip=true') if [[ -n "${HADOOP_PROFILE}" ]]; then - maven_args+=("-Phadoop-${HADOOP_PROFILE}") + maven_args+=("-Dhadoop.profile=${HADOOP_PROFILE}") fi # disabled because "maven_executor" needs to return both command and args @@ -644,7 +644,7 @@ function hadoopcheck_rebuild $(maven_executor) clean install \ -DskipTests -DHBasePatchProcess \ -Dhadoop-three.version="${hadoopver}" \ - -Phadoop-3.0 + -Dhadoop.profile="3.0" count=$(${GREP} -c '\[ERROR\]' "${logfile}") if [[ ${count} -gt 0 ]]; then add_vote_table -1 hadoopcheck "${BUILDMODEMSG} causes ${count} errors with Hadoop v${hadoopver}." -- 2.24.2 (Apple Git-127)