Skip to content

Commit f696c82

Browse files
committed
HBASE-28277 Move minimum hadoop 3 support to 3.3.x for 2.6+ (#5598)
Signed-off-by: Bryan Beaudreault <[email protected]> (cherry picked from commit 4aeabdc)
1 parent 6a26576 commit f696c82

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

dev-support/hbase-personality.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,13 +602,20 @@ function hadoopcheck_rebuild
602602
else
603603
hbase_hadoop3_versions="3.1.1 3.1.2 3.1.3 3.1.4 3.2.0 3.2.1 3.2.2 3.2.3 3.2.4 3.3.0 3.3.1 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6"
604604
fi
605-
else
606-
yetus_info "Setting Hadoop 3 versions to test based on branch-2.5+/master/feature branch rules"
605+
elif [[ "${PATCH_BRANCH}" = branch-2.5 ]]; then
606+
yetus_info "Setting Hadoop 3 versions to test based on branch-2.5 rules"
607607
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
608608
hbase_hadoop3_versions="3.2.4 3.3.6"
609609
else
610610
hbase_hadoop3_versions="3.2.3 3.2.4 3.3.2 3.3.3 3.3.4 3.3.5 3.3.6"
611611
fi
612+
else
613+
yetus_info "Setting Hadoop 3 versions to test based on branch-2.6+/master/feature branch rules"
614+
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
615+
hbase_hadoop3_versions="3.3.6"
616+
else
617+
hbase_hadoop3_versions="3.3.5 3.3.6"
618+
fi
612619
fi
613620

614621
export MAVEN_OPTS="${MAVEN_OPTS}"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@
797797
<maven.min.version>3.5.0</maven.min.version>
798798
<java.min.version>${compileSource}</java.min.version>
799799
<!-- Dependencies -->
800-
<hadoop-three.version>3.2.4</hadoop-three.version>
800+
<hadoop-three.version>3.3.5</hadoop-three.version>
801801
<!-- These must be defined here for downstream build tools that don't look at profiles.
802802
-->
803803
<hadoop.version>${hadoop-three.version}</hadoop.version>

0 commit comments

Comments
 (0)