[
https://issues.apache.org/jira/browse/KYLIN-3642?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16659452#comment-16659452
]
ASF GitHub Bot commented on KYLIN-3642:
---------------------------------------
shaofengshi closed pull request #305: KYLIN-3642 Exclude conflict jar
URL: https://github.com/apache/kylin/pull/305
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build/bin/find-hive-dependency.sh
b/build/bin/find-hive-dependency.sh
index 3eab5ca280..a8793ebb3c 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 3565bfcc1a..7179944376 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"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Exclude conflict jar
> --------------------
>
> Key: KYLIN-3642
> URL: https://issues.apache.org/jira/browse/KYLIN-3642
> Project: Kylin
> Issue Type: Task
> Components: Tools, Build and Test
> Reporter: Lijun Cao
> Assignee: Lijun Cao
> Priority: Major
> Fix For: v2.6.0
>
>
> The build script of Kylin for Hadoop 3 had added some code to eliminate jar
> conflict. These code should also be added to current master branch.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
