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/02/08 06:01:23 UTC
kylin git commit: KYLIN-2428 add log4j in tool shade
Repository: kylin
Updated Branches:
refs/heads/KYLIN-2428 6fd11fad5 -> d995caad5
KYLIN-2428 add log4j in tool shade
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d995caad
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d995caad
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d995caad
Branch: refs/heads/KYLIN-2428
Commit: d995caad5b402e78f8f95c6b1445ee567a6c9ce3
Parents: 6fd11fa
Author: Billy Liu <bi...@apache.org>
Authored: Wed Feb 8 14:01:11 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Wed Feb 8 14:01:11 2017 +0800
----------------------------------------------------------------------
build/bin/kylin.sh | 4 ++--
tool/pom.xml | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d995caad/build/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index 7813b79..abaca62 100644
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -38,8 +38,8 @@ function retrieveDependency() {
source ${dir}/setenv.sh
fi
- export HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/tool/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
- export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}
+ export HBASE_CLASSPATH_PREFIX=${KYLIN_HOME}/conf:${KYLIN_HOME}/lib/*:${KYLIN_HOME}/ext/*:${HBASE_CLASSPATH_PREFIX}
+ export HBASE_CLASSPATH=${HBASE_CLASSPATH}:${hive_dependency}:${KYLIN_HOME}/tool/*
if [ -n "$KAFKA_HOME" ]
then
source ${dir}/find-kafka-dependency.sh
http://git-wip-us.apache.org/repos/asf/kylin/blob/d995caad/tool/pom.xml
----------------------------------------------------------------------
diff --git a/tool/pom.xml b/tool/pom.xml
index b2f1d56..e9bb9ba 100644
--- a/tool/pom.xml
+++ b/tool/pom.xml
@@ -70,6 +70,16 @@
<artifactId>commons-lang</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
<!--Env-->
<dependency>
@@ -117,6 +127,9 @@
<includes>
<!-- shade the httpcore to avoid the lower version conflict with HBase one -->
<include>org.apache.httpcomponents:httpcore</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-log4j12</include>
+ <include>log4j:log4j</include>
<include>commons-io:commons-io</include>
<include>commons-lang:commons-lang</include>
<include>com.google.guava:guava</include>