Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D1DD917794 for ; Thu, 17 Sep 2015 10:05:00 +0000 (UTC) Received: (qmail 3583 invoked by uid 500); 17 Sep 2015 10:05:00 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 3553 invoked by uid 500); 17 Sep 2015 10:05:00 -0000 Mailing-List: contact commits-help@kylin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.incubator.apache.org Delivered-To: mailing list commits@kylin.incubator.apache.org Received: (qmail 3544 invoked by uid 99); 17 Sep 2015 10:05:00 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Sep 2015 10:05:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 4F8CAC0729 for ; Thu, 17 Sep 2015 10:05:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.775 X-Spam-Level: * X-Spam-Status: No, score=1.775 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id m2ZLigMuSO7z for ; Thu, 17 Sep 2015 10:04:50 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 6C87A4459A for ; Thu, 17 Sep 2015 10:04:50 +0000 (UTC) Received: (qmail 3480 invoked by uid 99); 17 Sep 2015 10:04:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Sep 2015 10:04:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A9E49E0FAF; Thu, 17 Sep 2015 10:04:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.incubator.apache.org Message-Id: <945a09cab04f4b80be223438a8609f15@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-kylin git commit: KYLIN-1010 fix target/ job jar name should start with kylin-assembly Date: Thu, 17 Sep 2015 10:04:49 +0000 (UTC) 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 Authored: Thu Sep 17 18:04:37 2015 +0800 Committer: Li, Yang 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()); }