Return-Path: 
 <commits-return-37227-apmail-ignite-commits-archive=ignite.apache.org@ignite.incubator.apache.org>
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 4AE8117A1B
	for <apmail-ignite-commits-archive@minotaur.apache.org>;
 Fri,  3 Apr 2015 15:32:41 +0000 (UTC)
Received: (qmail 76164 invoked by uid 500); 3 Apr 2015 15:32:38 -0000
Delivered-To: apmail-ignite-commits-archive@ignite.apache.org
Received: (qmail 76100 invoked by uid 500); 3 Apr 2015 15:32:38 -0000
Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.incubator.apache.org>
List-Post: <mailto:commits@ignite.incubator.apache.org>
List-Id: <commits.ignite.incubator.apache.org>
Reply-To: dev@ignite.incubator.apache.org
Delivered-To: mailing list commits@ignite.incubator.apache.org
Received: (qmail 76020 invoked by uid 99); 3 Apr 2015 15:32:37 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2015 15:32:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 03 Apr 2015 15:32:34 +0000
Received: (qmail 72577 invoked by uid 99); 3 Apr 2015 15:30:59 -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; Fri, 03 Apr 2015 15:30:59 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 30363E2F65; Fri,  3 Apr 2015 15:30:59 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: akuznetsov@apache.org
To: commits@ignite.incubator.apache.org
Date: Fri, 03 Apr 2015 15:31:34 -0000
Message-Id: <22c60904b81f4a33be128f1df312a65a@git.apache.org>
In-Reply-To: <4fddaab423b34e87ab9c050ee0357183@git.apache.org>
References: <4fddaab423b34e87ab9c050ee0357183@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [37/50] [abbrv] incubator-ignite git commit: ignite-658
X-Virus-Checked: Checked by ClamAV on apache.org

ignite-658


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/09a3a82b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/09a3a82b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/09a3a82b

Branch: refs/heads/ignite-639
Commit: 09a3a82b346c5b1f913941b4e3d27576787abbe4
Parents: adba7eb
Author: avinogradov <avinogradov@gridgain.com>
Authored: Fri Apr 3 12:45:23 2015 +0300
Committer: avinogradov <avinogradov@gridgain.com>
Committed: Fri Apr 3 12:45:23 2015 +0300

----------------------------------------------------------------------
 modules/core/pom.xml | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09a3a82b/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 5355e5a..466ccb9 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -270,14 +270,6 @@
                                 <configuration>
                                     <failOnError>false</failOnError>
                                     <target>
-                                        <exec executable="${git.exec}" outputproperty="ignite.build">
-                                            <arg line="log -1 --format=%ct" />
-                                        </exec>
-
-                                        <exec executable="${git.exec}" outputproperty="ignite.revision">
-                                            <arg line="log -1 --format=%H" />
-                                        </exec>
-
                                         <tstamp>
                                             <format property="ignite.rel.date" pattern="ddMMyyyy" locale="en" />
                                         </tstamp>
@@ -285,28 +277,38 @@
                                         <property name="props.file" value="../../modules/core/target/classes/ignite.properties" />
 
                                         <replaceregexp file="${props.file}" byline="true">
-                                            <regexp pattern="ignite.version=.*" />
-                                            <substitution expression="ignite.version=${project.version}" />
+                                            <regexp pattern="ignite.rel.date=.*" />
+                                            <substitution expression="ignite.rel.date=${ignite.rel.date}" />
                                         </replaceregexp>
 
                                         <replaceregexp file="${props.file}" byline="true">
-                                            <regexp pattern="ignite.build=.*" />
-                                            <substitution expression="ignite.build=${ignite.build}" />
+                                            <regexp pattern="ignite.update.status.params=.*" />
+                                            <substitution expression="ignite.update.status.params=ver=${project.version}" />
                                         </replaceregexp>
 
                                         <replaceregexp file="${props.file}" byline="true">
-                                            <regexp pattern="ignite.revision=.*" />
-                                            <substitution expression="ignite.revision=${ignite.revision}" />
+                                            <regexp pattern="ignite.version=.*" />
+                                            <substitution expression="ignite.version=${project.version}" />
                                         </replaceregexp>
 
+                                        <!-- git (to be replaced by git hooks)-->
+
+                                        <exec executable="${git.exec}" outputproperty="ignite.build" failonerror="true">
+                                            <arg line="log -1 --format=%ct" />
+                                        </exec>
+
+                                        <exec executable="${git.exec}" outputproperty="ignite.revision" failonerror="true">
+                                            <arg line="log -1 --format=%H" />
+                                        </exec>
+
                                         <replaceregexp file="${props.file}" byline="true">
-                                            <regexp pattern="ignite.rel.date=.*" />
-                                            <substitution expression="ignite.rel.date=${ignite.rel.date}" />
+                                            <regexp pattern="ignite.revision=.*" />
+                                            <substitution expression="ignite.revision=${ignite.revision}" />
                                         </replaceregexp>
 
                                         <replaceregexp file="${props.file}" byline="true">
-                                            <regexp pattern="ignite.update.status.params=.*" />
-                                            <substitution expression="ignite.update.status.params=ver=${project.version}" />
+                                            <regexp pattern="ignite.build=.*" />
+                                            <substitution expression="ignite.build=${ignite.build}" />
                                         </replaceregexp>
                                     </target>
                                 </configuration>