[kylin] 03/05: Update scripts for HDP 3.0

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.5.x-hadoop3.1
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 7a3097c486b62aef96e7a5c12a7832334d98e3c5
Author: shaofengshi <sh...@apache.org>
AuthorDate: Tue Aug 28 11:47:03 2018 +0800

    Update scripts for HDP 3.0
---
 build/bin/find-hive-dependency.sh  | 2 +-
 build/bin/find-spark-dependency.sh | 2 +-
 build/script/download-tomcat.sh    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/bin/find-hive-dependency.sh b/build/bin/find-hive-dependency.sh
index c647af1..02bad47 100755
--- a/build/bin/find-hive-dependency.sh
+++ b/build/bin/find-hive-dependency.sh
@@ -150,7 +150,7 @@ then
 else
     hive_lib_dir="$HIVE_LIB"
 fi
-hive_lib=`find -L ${hive_lib_dir} -name '*.jar' ! -name '*calcite*' ! -name '*jackson-datatype-joda*' ! -name '*derby*' -printf '%p:' | sed 's/:$//'`
+hive_lib=`find -L ${hive_lib_dir} -name '*.jar' ! -name '*druid*' ! -name '*slf4j*' ! -name '*avatica*' ! -name '*calcite*' ! -name '*jackson-datatype-joda*' ! -name '*derby*' -printf '%p:' | sed 's/:$//'`
 
 validateDirectory ${hive_conf_path}
 checkFileExist ${hive_lib}
diff --git a/build/bin/find-spark-dependency.sh b/build/bin/find-spark-dependency.sh
index 3565bfc..7179944 100755
--- a/build/bin/find-spark-dependency.sh
+++ b/build/bin/find-spark-dependency.sh
@@ -35,7 +35,7 @@ then
     spark_home=$KYLIN_HOME/spark
 fi
 
-spark_dependency=`find -L $spark_home/jars -name '*.jar' ! -name '*doc*' ! -name '*test*' ! -name '*sources*' ''-printf '%p:' | sed 's/:$//'`
+spark_dependency=`find -L $spark_home/jars -name '*.jar' ! -name '*slf4j*' ! -name '*calcite*' ! -name '*doc*' ! -name '*test*' ! -name '*sources*' ''-printf '%p:' | sed 's/:$//'`
 if [ -z "$spark_dependency" ]
 then
     quit "spark jars not found"
diff --git a/build/script/download-tomcat.sh b/build/script/download-tomcat.sh
index beda172..eefc6ba 100755
--- a/build/script/download-tomcat.sh
+++ b/build/script/download-tomcat.sh
@@ -27,13 +27,13 @@ if [[ `uname -a` =~ "Darwin" ]]; then
     alias md5cmd="md5 -q"
 fi
 
-tomcat_pkg_version="7.0.85"
-tomcat_pkg_md5="1ad4760080164bb08e924c330703c94d"
+tomcat_pkg_version="8.5.33"
+tomcat_pkg_md5="79a5ce0bb2c1503a8e46bf00c6ed9181"
 
 if [ ! -f "build/apache-tomcat-${tomcat_pkg_version}.tar.gz" ]
 then
     echo "no binary file found"
-    wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "Download tomcat failed"
+    wget --directory-prefix=build/ http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat_pkg_version}/bin/apache-tomcat-${tomcat_pkg_version}.tar.gz || echo "Download tomcat failed"
 else
     if [ `md5cmd build/apache-tomcat-${tomcat_pkg_version}.tar.gz | awk '{print $1}'` != "${tomcat_pkg_md5}" ]
     then