[kylin] 08/16: KYLIN-4086 Upgrade avatica to 1.12

[ni...@apache.org]

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

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

commit ab6138324f1df808e7cdd22c9d9d9c45fe8b4600
Author: nichunen <ni...@apache.org>
AuthorDate: Mon Jul 22 23:21:50 2019 +0800

    KYLIN-4086 Upgrade avatica to 1.12
---
 build/script/elimate-jar-conflict.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/script/elimate-jar-conflict.sh b/build/script/elimate-jar-conflict.sh
index d02a874..84bec69 100644
--- a/build/script/elimate-jar-conflict.sh
+++ b/build/script/elimate-jar-conflict.sh
@@ -6,13 +6,13 @@ unzip kylin.war && rm -f kylin.war
 cd WEB-INF/lib
 #remove slf4j-api-1.7.21.jar to solve slf4j conflict
 rm -f slf4j-api-1.7.21.jar
-mkdir modify_avatica_jar && mv avatica-1.10.0.jar modify_avatica_jar
+mkdir modify_avatica_jar && mv avatica-1.12.0.jar modify_avatica_jar
 cd modify_avatica_jar
-#remove org/slf4j in avatica-1.10.0.jar and repackage it to solve slf4j conflict
-unzip avatica-1.10.0.jar && rm -f avatica-1.10.0.jar
-rm -rf org/slf4j && jar -cf avatica-1.10.0.jar ./
-rm -rf `ls | egrep -v avatica-1.10.0.jar`
-mv avatica-1.10.0.jar ..
+#remove org/slf4j in avatica-1.12.0.jar and repackage it to solve slf4j conflict
+unzip avatica-1.12.0.jar && rm -f avatica-1.12.0.jar
+rm -rf org/slf4j && jar -cf avatica-1.12.0.jar ./
+rm -rf `ls | egrep -v avatica-1.12.0.jar`
+mv avatica-1.12.0.jar ..
 cd .. && rm -rf modify_avatica_jar
 cd ${current_dir}/build/tomcat/webapps
 #repackage kylin.war