Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-26176 Correct regex in hbase-personality.sh (#3567) 

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
This commit is contained in:
Peter Somogyi 2021-08-09 10:53:41 +02:00
parent 611ffa7da9
commit 57361bb6bf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev-support/hbase-personality.sh
View File

@ -148,7 +148,7 @@ function personality_modules
# If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along # If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
# the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3 # the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
# logic is not both activated within Maven. # logic is not both activated within Maven.
if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" =~ branch-2* ]] ; then if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" = branch-2* ]] ; then
extra="${extra} -Dhadoop.profile=${HADOOP_PROFILE}" extra="${extra} -Dhadoop.profile=${HADOOP_PROFILE}"
fi fi
@ -354,7 +354,7 @@ function refguide_filefilter
if [[ ${filename} =~ src/main/asciidoc ]] || if [[ ${filename} =~ src/main/asciidoc ]] ||
[[ ${filename} =~ src/main/xslt ]] || [[ ${filename} =~ src/main/xslt ]] ||
[[ ${filename} =~ hbase-common/src/main/resources/hbase-default.xml ]]; then [[ ${filename} =~ hbase-common/src/main/resources/hbase-default\.xml ]]; then
add_test refguide add_test refguide
fi fi
} }
@ -464,7 +464,7 @@ function shadedjars_rebuild
# If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along # If we have HADOOP_PROFILE specified and we're on branch-2.x, pass along
# the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3 # the hadoop.profile system property. Ensures that Hadoop2 and Hadoop3
# logic is not both activated within Maven. # logic is not both activated within Maven.
if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" =~ branch-2* ]] ; then if [[ -n "${HADOOP_PROFILE}" ]] && [[ "${PATCH_BRANCH}" = branch-2* ]] ; then
maven_args+=("-Dhadoop.profile=${HADOOP_PROFILE}") maven_args+=("-Dhadoop.profile=${HADOOP_PROFILE}")
fi fi
@ -495,7 +495,7 @@ function hadoopcheck_filefilter
{ {
local filename=$1 local filename=$1
if [[ ${filename} =~ \.java$ ]] || [[ ${filename} =~ pom.xml$ ]]; then if [[ ${filename} =~ \.java$ ]] || [[ ${filename} =~ pom\.xml$ ]]; then
add_test hadoopcheck add_test hadoopcheck
fi fi
} }
@ -643,7 +643,7 @@ function hadoopcheck_rebuild
done done
hadoop_profile="" hadoop_profile=""
if [[ "${PATCH_BRANCH}" =~ branch-2* ]]; then if [[ "${PATCH_BRANCH}" = branch-2* ]]; then
hadoop_profile="-Dhadoop.profile=3.0" hadoop_profile="-Dhadoop.profile=3.0"
fi fi
for hadoopver in ${hbase_hadoop3_versions}; do for hadoopver in ${hbase_hadoop3_versions}; do