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-674 Commit: 09a3a82b346c5b1f913941b4e3d27576787abbe4 Parents: adba7eb Author: avinogradov <[email protected]> Authored: Fri Apr 3 12:45:23 2015 +0300 Committer: avinogradov <[email protected]> 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>
