You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2017/03/11 17:17:21 UTC
[04/14] kylin git commit: minor,
add missing dependency for tool-assembly module
minor, add missing dependency for tool-assembly module
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/70dda404
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/70dda404
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/70dda404
Branch: refs/heads/KYLIN-2360
Commit: 70dda40448bbd5622788dbfea591bf54aa4cdc8a
Parents: 181890e
Author: lidongsjtu <li...@apache.org>
Authored: Fri Mar 10 14:16:37 2017 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Fri Mar 10 14:16:48 2017 +0800
----------------------------------------------------------------------
build/bin/diag.sh | 2 +-
tool-assembly/pom.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/70dda404/build/bin/diag.sh
----------------------------------------------------------------------
diff --git a/build/bin/diag.sh b/build/bin/diag.sh
index 5f3cec3..e9354a2 100644
--- a/build/bin/diag.sh
+++ b/build/bin/diag.sh
@@ -47,7 +47,7 @@ then
fi
mkdir -p ${KYLIN_HOME}/ext
- export HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
+ export HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}
if [ ${#patient} -eq 36 ]; then
http://git-wip-us.apache.org/repos/asf/kylin/blob/70dda404/tool-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/tool-assembly/pom.xml b/tool-assembly/pom.xml
index 126c0bc..f7faad0 100644
--- a/tool-assembly/pom.xml
+++ b/tool-assembly/pom.xml
@@ -91,6 +91,7 @@
<artifactSet>
<includes>
<!-- shade the httpcore to avoid the lower version conflict with HBase one -->
+ <include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>