[kylin] branch kylin-on-parquet-v2 updated: In some Hadoop versions, kylin calcite reported error because there is no guava14

[xxyu]

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

xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this 
push:
     new 92727d6  In some Hadoop versions, kylin calcite reported error because 
there is no guava14
92727d6 is described below

commit 92727d6c411f1848a0f829e39a22e7388b8e5c43
Author: yaqian.zhang <598593...@qq.com>
AuthorDate: Fri Oct 23 10:51:32 2020 +0800

    In some Hadoop versions, kylin calcite reported error because there is no 
guava14
---
 build/bin/kylin.sh | 18 ++++++++++++++++++
 pom.xml            |  3 +--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index 817227f..c6048e2 100755
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -73,6 +73,24 @@ function retrieveDependency() {
     if [[ -d "/usr/hdp/current/hdinsight-zookeeper" && $hdp_version == "2"* ]]
     then
        echo "The current Hadoop environment is HDI3, will replace some jars 
package for ${KYLIN_HOME}/spark/jars"
+       if [[ -f ${KYLIN_HOME}/tomcat/webapps/kylin.war ]]
+       then
+          if [[ ! -d ${KYLIN_HOME}/tomcat/webapps/kylin ]]
+          then
+             mkdir ${KYLIN_HOME}/tomcat/webapps/kylin
+          fi
+          mv ${KYLIN_HOME}/tomcat/webapps/kylin.war 
${KYLIN_HOME}/tomcat/webapps/kylin
+          cd ${KYLIN_HOME}/tomcat/webapps/kylin
+          jar -xf ${KYLIN_HOME}/tomcat/webapps/kylin/kylin.war
+          if [[ -f 
${KYLIN_HOME}/tomcat/webapps/kylin/WEB-INF/lib/guava-14.0.jar ]]
+          then
+             echo "Remove 
${KYLIN_HOME}/tomcat/webapps/kylin/WEB-INF/lib/guava-14.0.jar to avoid version 
conflicts"
+             rm -rf 
${KYLIN_HOME}/tomcat/webapps/kylin/WEB-INF/lib/guava-14.0.jar
+             rm -rf ${KYLIN_HOME}/tomcat/webapps/kylin/kylin.war
+             cd ${KYLIN_HOME}/
+          fi
+       fi
+
        if [[ -d "${KYLIN_SPARK_JARS_HOME}" ]]
        then
           if [[ -f ${KYLIN_HOME}/hdi3_spark_jars_flag ]]
diff --git a/pom.xml b/pom.xml
index 6bf0ddf..4843dbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1321,8 +1321,7 @@
           <configuration>
             <packagingExcludes>
               WEB-INF/lib/servlet-api-*.jar,
-              WEB-INF/lib/zookeeper-*.jar,
-              WEB-INF/lib/guava-14.0.jar
+              WEB-INF/lib/zookeeper-*.jar
             </packagingExcludes>
           </configuration>
         </plugin>