You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/09/17 12:04:49 UTC
incubator-kylin git commit: KYLIN-1010 fix target/ job jar name
should start with kylin-assembly
Repository: incubator-kylin
Updated Branches:
refs/heads/KYLIN-1010 6c59e1077 -> d7e157674
KYLIN-1010 fix target/ job jar name should start with kylin-assembly
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d7e15767
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d7e15767
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d7e15767
Branch: refs/heads/KYLIN-1010
Commit: d7e1576747ffb931afaf02a8a329fedd72fa5e17
Parents: 6c59e10
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Sep 17 18:04:37 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Sep 17 18:04:37 2015 +0800
----------------------------------------------------------------------
assembly/src/test/java/org/apache/kylin/job/DeployUtil.java | 2 +-
build/script/prepare_libs.sh | 2 +-
server/src/main/java/org/apache/kylin/rest/DebugTomcat.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d7e15767/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java
----------------------------------------------------------------------
diff --git a/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java b/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java
index 045f608..d47a664 100644
--- a/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java
+++ b/assembly/src/test/java/org/apache/kylin/job/DeployUtil.java
@@ -94,7 +94,7 @@ public class DeployUtil {
}
private static File getJobJarFile() {
- return new File("../assembly/target", "kylin-job-" + getPomVersion() + "-job.jar");
+ return new File("../assembly/target", "kylin-assembly-" + getPomVersion() + "-job.jar");
}
private static File getCoprocessorJarFile() {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d7e15767/build/script/prepare_libs.sh
----------------------------------------------------------------------
diff --git a/build/script/prepare_libs.sh b/build/script/prepare_libs.sh
index 2012b3f..57888ff 100755
--- a/build/script/prepare_libs.sh
+++ b/build/script/prepare_libs.sh
@@ -13,7 +13,7 @@ echo "version ${version}"
echo "copy lib file"
rm -rf build/lib
mkdir build/lib
-cp assembly/target/kylin-job-${version}-job.jar build/lib/kylin-job-${version}.jar
+cp assembly/target/kylin-assembly-${version}-job.jar build/lib/kylin-job-${version}.jar
cp storage-hbase/target/kylin-storage-hbase-${version}-coprocessor.jar build/lib/kylin-coprocessor-${version}.jar
cp jdbc/target/kylin-jdbc-${version}.jar build/lib/kylin-jdbc-${version}.jar
# Copied file becomes 000 for some env (e.g. my Cygwin)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d7e15767/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
index fe345b9..4df1ca4 100644
--- a/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
+++ b/server/src/main/java/org/apache/kylin/rest/DebugTomcat.java
@@ -75,7 +75,7 @@ public class DebugTomcat {
private static void overrideDevJobJarLocations() {
KylinConfig conf = KylinConfig.getInstanceFromEnv();
- File devJobJar = findFile("../assembly/target", "kylin-job-.*-SNAPSHOT-job.jar");
+ File devJobJar = findFile("../assembly/target", "kylin-assembly-.*-SNAPSHOT-job.jar");
if (devJobJar != null) {
conf.overrideMRJobJarPath(devJobJar.getAbsolutePath());
}