You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2016/06/15 09:27:38 UTC
ambari git commit: AMBARI-17234. "ambari-server --version" command
does not show build number.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 d60867cd8 -> 8de7bbd90
AMBARI-17234. "ambari-server --version" command does not show build number.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8de7bbd9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8de7bbd9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8de7bbd9
Branch: refs/heads/branch-2.4
Commit: 8de7bbd90fe3475e515ba646d87978f83819d1d4
Parents: d60867c
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Tue Jun 14 19:20:48 2016 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Tue Jun 14 19:20:48 2016 +0300
----------------------------------------------------------------------
ambari-server/pom.xml | 13 +++++++++++++
ambari-server/sbin/ambari-server | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de7bbd9/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index b488971..d822ac2 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -76,6 +76,19 @@
</configuration>
</execution>
<execution>
+ <id>full-version</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>ambariFullVersion</name>
+ <value>${project.version}</value>
+ <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+).*</regex>
+ <replacement>$1.$2.$3.$4-$5</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ <execution>
<id>regex-schema-version</id>
<goals>
<goal>regex-property</goal>
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de7bbd9/ambari-server/sbin/ambari-server
----------------------------------------------------------------------
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index 83a52c6..29af308 100755
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -21,7 +21,7 @@
# /etc/init.d/ambari-server
-VERSION="${ambariVersion}"
+VERSION="${ambariFullVersion}"
HASH="${buildNumber}"
case "$1" in