Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 29CBE18E02 for ; Wed, 1 Jul 2015 09:47:34 +0000 (UTC) Received: (qmail 3745 invoked by uid 500); 1 Jul 2015 09:47:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 3715 invoked by uid 500); 1 Jul 2015 09:47:34 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 3706 invoked by uid 99); 1 Jul 2015 09:47:34 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2015 09:47:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 84B25D1641 for ; Wed, 1 Jul 2015 09:47:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.229 X-Spam-Level: X-Spam-Status: No, score=0.229 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-0.571] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id zYfWWKINSOl3 for ; Wed, 1 Jul 2015 09:47:18 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 1B077261B0 for ; Wed, 1 Jul 2015 09:47:18 +0000 (UTC) Received: (qmail 2936 invoked by uid 99); 1 Jul 2015 09:47:17 -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; Wed, 01 Jul 2015 09:47:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5717DFE60; Wed, 1 Jul 2015 09:47:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Jul 2015 09:47:18 -0000 Message-Id: In-Reply-To: <8ca46bb58ba64c97b06a6d6ab0b0c9c0@git.apache.org> References: <8ca46bb58ba64c97b06a6d6ab0b0c9c0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/16] incubator-ignite git commit: IGNITE-1046 Added default option libs. IGNITE-1046 Added default option libs. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f57aa921 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f57aa921 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f57aa921 Branch: refs/heads/ignite-1031 Commit: f57aa921e7ac7b583b0f31931890f1f9454f3b1a Parents: 9de7d24 Author: nikolay_tikhonov Authored: Fri Jun 26 13:06:45 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Jun 26 13:06:45 2015 +0300 ---------------------------------------------------------------------- modules/docker/execute.sh | 4 ++++ modules/docker/run.sh | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f57aa921/modules/docker/execute.sh ---------------------------------------------------------------------- diff --git a/modules/docker/execute.sh b/modules/docker/execute.sh index 2aaaa2d..e0ed90c 100644 --- a/modules/docker/execute.sh +++ b/modules/docker/execute.sh @@ -8,6 +8,10 @@ if [ ! -z "$GIT_REPO" ]; then fi fi +if [ -z "$OPTION_LIBS" ]; then + OPTION_LIBS="ignite-log4j" +fi + if [ ! -z "$OPTION_LIBS" ]; then IFS=, LIBS_LIST=("$OPTION_LIBS") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f57aa921/modules/docker/run.sh ---------------------------------------------------------------------- diff --git a/modules/docker/run.sh b/modules/docker/run.sh index 42fb29d..2e3110d 100644 --- a/modules/docker/run.sh +++ b/modules/docker/run.sh @@ -1,11 +1,16 @@ #!/bin/bash -if [ -z $SKIP_DOWNLOAD ]; then - ./download_ignite.sh -fi +IGNITE_VERSION="" if [ -z $SKIP_BUILD_LIBS ]; then ./build_users_libs.sh + + IGNITE_VERSION=$(mvn -f user-repo/pom.xml dependency:list | grep ':ignite-core:jar:.*:' | \ + sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p') +fi + +if [ -z $SKIP_DOWNLOAD ]; then + IGNITE_VERSION=$IGNITE_VERSION ./download_ignite.sh fi ./execute.sh \ No newline at end of file