diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index eb972589a995e..31633456a6590 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -276,14 +276,14 @@ if [[ "$1" == "package" ]]; then # list of packages to be built, so it's ok for things to be missing in BINARY_PKGS_EXTRA. declare -A BINARY_PKGS_ARGS - BINARY_PKGS_ARGS["hadoop2.7"]="-Phadoop-2.7 $HIVE_PROFILES" + BINARY_PKGS_ARGS["hadoop3.2"]="-Phadoop-3.2 $HIVE_PROFILES" if ! is_dry_run; then BINARY_PKGS_ARGS["without-hadoop"]="-Phadoop-provided" if [[ $SPARK_VERSION < "3.0." ]]; then BINARY_PKGS_ARGS["hadoop2.6"]="-Phadoop-2.6 $HIVE_PROFILES" else BINARY_PKGS_ARGS["hadoop2.7-hive1.2"]="-Phadoop-2.7 -Phive-1.2 $HIVE_PROFILES" - BINARY_PKGS_ARGS["hadoop3.2"]="-Phadoop-3.2 $HIVE_PROFILES" + BINARY_PKGS_ARGS["hadoop2.7"]="-Phadoop-2.7 $HIVE_PROFILES" fi fi diff --git a/dev/run-tests.py b/dev/run-tests.py index 5255a77ec2081..ec04c37857d96 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -574,7 +574,7 @@ def main(): # if we're on the Amplab Jenkins build servers setup variables # to reflect the environment settings build_tool = os.environ.get("AMPLAB_JENKINS_BUILD_TOOL", "sbt") - hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop2.7") + hadoop_version = os.environ.get("AMPLAB_JENKINS_BUILD_PROFILE", "hadoop3.2") hive_version = os.environ.get("AMPLAB_JENKINS_BUILD_HIVE_PROFILE", "hive2.3") test_env = "amplab_jenkins" # add path for Python3 in Jenkins if we're calling from a Jenkins machine diff --git a/pom.xml b/pom.xml index 3abbf871ad2de..7093ee09a5ad6 100644 --- a/pom.xml +++ b/pom.xml @@ -119,11 +119,11 @@ spark 1.7.30 1.2.17 - 2.7.4 + 3.2.0 2.5.0 ${hadoop.version} 3.4.14 - 2.7.1 + 2.13.0 org.apache.hive core @@ -170,7 +170,7 @@ 1.1.7.5 1.1.2 1.10 - 2.4 + 2.5 2.6 @@ -3048,16 +3048,16 @@ hadoop-2.7 - + + 2.7.4 + 2.7.1 + 2.4 + hadoop-3.2 - - 3.2.0 - 2.13.0 - 2.5 - + diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 503540403f5ec..d1e00cc0b5b10 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -186,9 +186,6 @@ hadoop-2.7 - - true - com.amazonaws @@ -200,6 +197,9 @@ hadoop-3.2 + + true + com.amazonaws