From 06fb8ce3e7df4a7d1f8c8c66ddf8dcd0f2b07dab Mon Sep 17 00:00:00 2001 From: Apekshit Sharma Date: Mon, 11 Dec 2017 18:30:14 -0800 Subject: [PATCH] HBASE-19489 Adds QUICK_HADOOPCHECK flag to check against only the latest maintenance releases in "hadoopcheck". Updates hadoop version to 3.0.0-beta1. --- dev-support/hbase-personality.sh | 23 +++++++++++++--------- .../src/main/resources/supplemental-models.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 11f8731371..03ed8b20a5 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -260,18 +260,23 @@ function hadoopcheck_rebuild # All supported Hadoop versions that we want to test the compilation with # See the Hadoop section on prereqs in the HBase Reference Guide + hbase_common_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" if [[ "${PATCH_BRANCH}" = branch-1* ]]; then - yetus_info "setting Hadoop versions to test based on branch-1-ish rules." - hbase_hadoop2_versions="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" + yetus_info "Setting Hadoop versions to test based on branch-1-ish rules." + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop2_versions="2.4.1 2.5.2 2.6.5 2.7.4" + else + hbase_hadoop2_versions="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 ${hbase_common_hadoop2_versions}" + fi hbase_hadoop3_versions="" - elif [[ ${PATCH_BRANCH} = branch-2* ]]; then - yetus_info "setting Hadoop versions to test based on branch-2-ish rules." - hbase_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" - hbase_hadoop3_versions="3.0.0-alpha4" else # master or a feature branch - yetus_info "setting Hadoop versions to test based on master/feature branch rules." - hbase_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4" - hbase_hadoop3_versions="3.0.0-alpha4" + yetus_info "Setting Hadoop versions to test based on branch-2/master/feature branch rules." + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop2_versions="2.6.5 2.7.4" + else + hbase_hadoop2_versions="${hbase_common_hadoop2_versions}" + fi + hbase_hadoop3_versions="3.0.0-beta1" fi export MAVEN_OPTS="${MAVEN_OPTS}" diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 880226a529..af193c6539 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -800,7 +800,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + org.codehaus.woodstox stax2-api 3.1.4 @@ -1299,7 +1299,7 @@ Mozilla Public License Version 2.0 means any form of the work other than Source Code Form. 1.7. "Larger Work" - means a work that combines Covered Software with other material, in + means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. 1.8. "License" diff --git a/pom.xml b/pom.xml index b9f528dacc..aece338a89 100755 --- a/pom.xml +++ b/pom.xml @@ -1402,7 +1402,7 @@ ${compileSource} 2.7.4 - 3.0.0-alpha4 + 3.0.0-beta1 -- 2.14.1