From 885cf7a1ea71aace46a581a84786353e7022bbfd Mon Sep 17 00:00:00 2001 From: Kent Yao Date: Mon, 6 Jul 2020 11:13:07 +0800 Subject: [PATCH 1/3] [SPARK-32058][BUILD][SQL][test-hive1.2][FOLLOWUP] Set hadoop 2.7.4 for hive 1.2 profile --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 08ca13bfe9d37..7ea7e63578ad8 100644 --- a/pom.xml +++ b/pom.xml @@ -3084,6 +3084,9 @@ provided nohive 3.2.10 + 2.7.4 + 2.7.1 + 2.4 From 5fed5a2c5f74672414123d7e221e0c11b90356c2 Mon Sep 17 00:00:00 2001 From: Kent Yao Date: Mon, 6 Jul 2020 11:21:46 +0800 Subject: [PATCH 2/3] test --- dev/run-tests-jenkins.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/run-tests-jenkins.py b/dev/run-tests-jenkins.py index 13be9592d771f..746670c8f3b36 100755 --- a/dev/run-tests-jenkins.py +++ b/dev/run-tests-jenkins.py @@ -183,6 +183,7 @@ def main(): # Switch the Hive profile based on the PR title: if "test-hive1.2" in ghprb_pull_title: os.environ["AMPLAB_JENKINS_BUILD_HIVE_PROFILE"] = "hive1.2" + os.environ["AMPLAB_JENKINS_BUILD_PROFILE"] = "hadoop2.7" if "test-hive2.3" in ghprb_pull_title: os.environ["AMPLAB_JENKINS_BUILD_HIVE_PROFILE"] = "hive2.3" From e1db207df51ae7c27dbb5186bc82c8860291370f Mon Sep 17 00:00:00 2001 From: Kent Yao Date: Mon, 6 Jul 2020 15:25:15 +0800 Subject: [PATCH 3/3] use maven-enforcer --- dev/run-tests-jenkins.py | 1 - pom.xml | 28 +++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dev/run-tests-jenkins.py b/dev/run-tests-jenkins.py index 746670c8f3b36..13be9592d771f 100755 --- a/dev/run-tests-jenkins.py +++ b/dev/run-tests-jenkins.py @@ -183,7 +183,6 @@ def main(): # Switch the Hive profile based on the PR title: if "test-hive1.2" in ghprb_pull_title: os.environ["AMPLAB_JENKINS_BUILD_HIVE_PROFILE"] = "hive1.2" - os.environ["AMPLAB_JENKINS_BUILD_PROFILE"] = "hadoop2.7" if "test-hive2.3" in ghprb_pull_title: os.environ["AMPLAB_JENKINS_BUILD_HIVE_PROFILE"] = "hive2.3" diff --git a/pom.xml b/pom.xml index 7ea7e63578ad8..96597b97fe53b 100644 --- a/pom.xml +++ b/pom.xml @@ -3084,10 +3084,32 @@ provided nohive 3.2.10 - 2.7.4 - 2.7.1 - 2.4 + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-hadoop-versions + + enforce + + + + + + org.apache.hadoop:*:[3.2.0,) + + + + + + + + +