ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: AMBARI-17234. "ambari-server --version" command does not show build number.(vbrodetskyi)
Date Wed, 15 Jun 2016 09:31:33 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7fc33c142 -> 4edadd787


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/4edadd78
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4edadd78
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4edadd78

Branch: refs/heads/trunk
Commit: 4edadd787f0c2eea9ea9f4553e87d7908a93343c
Parents: 7fc33c1
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Tue Jun 14 19:24:46 2016 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Tue Jun 14 19:24:46 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/4edadd78/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 20d3fab..d1696ae 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/4edadd78/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


Mime
View raw message