From e4f4ae835fcba66b9a651b801ef4d5d776901f8a Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Thu, 30 May 2019 10:17:13 +0800
Subject: [PATCH] HBASE-22500 Modify pom and jenkins jobs for hadoop versions

Signed-off-by: Peter Somogyi <psomogyi@apache.org>
---
 dev-support/Jenkinsfile          |  4 ++--
 dev-support/hbase-personality.sh | 13 ++++++++++---
 pom.xml                          |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index e26cadb1ab0..10c38419c6c 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -116,7 +116,7 @@ pipeline {
         }
         stage ('hadoop 2 cache') {
           environment {
-            HADOOP2_VERSION="2.8.2"
+            HADOOP2_VERSION="2.8.5"
           }
           steps {
             // directory must be unique for each parallel stage, because jenkins runs them in the same workspace :(
@@ -143,7 +143,7 @@ pipeline {
         }
         stage ('hadoop 3 cache') {
           environment {
-            HADOOP3_VERSION="3.0.3"
+            HADOOP3_VERSION="3.1.1"
           }
           steps {
             // directory must be unique for each parallel stage, because jenkins runs them in the same workspace :(
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 3aa136341cf..f2105969ebe 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -530,19 +530,26 @@ function hadoopcheck_rebuild
     if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
       hbase_hadoop2_versions="2.8.5 2.9.2"
     else
-      hbase_hadoop2_versions="2.8.2 2.8.3 2.8.4 2.8.5 2.9.1 2.9.2"
+      hbase_hadoop2_versions="2.8.5 2.9.2"
     fi
   fi
   if [[ "${PATCH_BRANCH}" = branch-1* ]]; then
     yetus_info "Setting Hadoop 3 versions to test based on branch-1.x rules."
     hbase_hadoop3_versions=""
-  else
-    yetus_info "Setting Hadoop 3 versions to test based on branch-2.x/master/feature branch rules"
+  elif [[ "${PATCH_BRANCH}" = branch-2.0 ]] || [[ "${PATCH_BRANCH}" = branch-2.1 ]]; then
+    yetus_info "Setting Hadoop 3 versions to test based on branch-2.0/branch-2.1 rules"
     if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
       hbase_hadoop3_versions="3.0.3 3.1.2"
     else
       hbase_hadoop3_versions="3.0.3 3.1.1 3.1.2"
     fi
+  else
+    yetus_info "Setting Hadoop 3 versions to test based on branch-2.2+/master/feature branch rules"
+    if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
+      hbase_hadoop3_versions="3.1.2"
+    else
+      hbase_hadoop3_versions="3.1.1 3.1.2"
+    fi
   fi
 
   export MAVEN_OPTS="${MAVEN_OPTS}"
diff --git a/pom.xml b/pom.xml
index 9bd35aa8203..7e41f09e84f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1419,7 +1419,7 @@
     <java.min.version>${compileSource}</java.min.version>
     <!-- Dependencies -->
     <hadoop-two.version>2.8.5</hadoop-two.version>
-    <hadoop-three.version>3.0.3</hadoop-three.version>
+    <hadoop-three.version>3.1.1</hadoop-three.version>
     <!-- These must be defined here for downstream build tools that don't look at profiles.
          They ought to match the values found in our default hadoop profile, which is
          currently "hadoop-2.0". See HBASE-15925 for more info. -->