Repository: kylin Updated Branches: refs/heads/master 1d0c4d4fd -> 632c20b16
KYLIN-3006 Upgrade Spark to 2.1.2 Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/632c20b1 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/632c20b1 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/632c20b1 Branch: refs/heads/master Commit: 632c20b16fec2530e466ab4728e7cda133b61586 Parents: 1d0c4d4 Author: shaofengshi <shaofeng...@apache.org> Authored: Sat Nov 4 18:14:35 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sat Nov 4 18:14:35 2017 +0800 ---------------------------------------------------------------------- build/script/download-spark.sh | 18 +++++++++--------- pom.xml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/632c20b1/build/script/download-spark.sh ---------------------------------------------------------------------- diff --git a/build/script/download-spark.sh b/build/script/download-spark.sh index 8025591..ed904b5 100755 --- a/build/script/download-spark.sh +++ b/build/script/download-spark.sh @@ -27,26 +27,26 @@ if [[ `uname -a` =~ "Darwin" ]]; then alias md5cmd="md5 -q" fi -spark_version="2.1.1" -spark_pkg_md5="195daab700e4332fcdaf7c66236de542" +spark_version="2.1.2" +spark_pkg_md5="b47cf199bf78042a0471b9a5ae0ceeac" -if [ ! -f "build/spark-${spark_version}-bin-hadoop2.6.tgz" ] +if [ ! -f "build/spark-${spark_version}-bin-hadoop2.7.tgz" ] then echo "no binary file found" - wget --directory-prefix=build/ http://archive.apache.org/dist/spark/spark-${spark_version}/spark-${spark_version}-bin-hadoop2.6.tgz || echo "Download spark failed" + wget --directory-prefix=build/ http://archive.apache.org/dist/spark/spark-${spark_version}/spark-${spark_version}-bin-hadoop2.7.tgz || echo "Download spark failed" else - if [ `md5cmd build/spark-${spark_version}-bin-hadoop2.6.tgz | awk '{print $1}'` != "${spark_pkg_md5}" ] + if [ `md5cmd build/spark-${spark_version}-bin-hadoop2.7.tgz | awk '{print $1}'` != "${spark_pkg_md5}" ] then echo "md5 check failed" - rm build/spark-${spark_version}-bin-hadoop2.6.tgz - wget --directory-prefix=build/ http://archive.apache.org/dist/spark/spark-${spark_version}/spark-${spark_version}-bin-hadoop2.6.tgz || echo "Download spark failed" + rm build/spark-${spark_version}-bin-hadoop2.7.tgz + wget --directory-prefix=build/ http://archive.apache.org/dist/spark/spark-${spark_version}/spark-${spark_version}-bin-hadoop2.7.tgz || echo "Download spark failed" fi fi unalias md5cmd -tar -zxvf build/spark-${spark_version}-bin-hadoop2.6.tgz -C build/ || { exit 1; } -mv build/spark-${spark_version}-bin-hadoop2.6 build/spark +tar -zxvf build/spark-${spark_version}-bin-hadoop2.7.tgz -C build/ || { exit 1; } +mv build/spark-${spark_version}-bin-hadoop2.7 build/spark # Remove unused components in Spark rm -rf build/spark/lib/spark-examples-* http://git-wip-us.apache.org/repos/asf/kylin/blob/632c20b1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c3f1e4a..c85974a 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <kafka.version>0.11.0.1</kafka.version> <!-- Spark versions --> - <spark.version>2.1.1</spark.version> + <spark.version>2.1.2</spark.version> <kryo.version>4.0.0</kryo.version> <!-- <reflections.version>0.9.10</reflections.version> -->