You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2013/08/23 19:56:20 UTC
git commit: AMBARI-3002. Add git hash to the rpm build - a file which
has the latest git hash in it. (Dmytro Shkvyra via dlysnichenko)
Updated Branches:
refs/heads/trunk 82adc3442 -> 5cd2cde22
AMBARI-3002. Add git hash to the rpm build - a file which has the latest git hash in it. (Dmytro Shkvyra via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/5cd2cde2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/5cd2cde2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/5cd2cde2
Branch: refs/heads/trunk
Commit: 5cd2cde22ba43dd1fa5c8f9eeea9949b163334c1
Parents: 82adc34
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Aug 23 20:54:00 2013 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Aug 23 20:54:00 2013 +0300
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 14 ++++++++++++++
ambari-agent/pom.xml | 17 +++++++++++++++++
ambari-server/pom.xml | 17 +++++++++++++++++
ambari-server/sbin/ambari-server | 14 ++++++++++++++
pom.xml | 1 +
5 files changed, 63 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5cd2cde2/ambari-agent/conf/unix/ambari-agent
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index 865960f..b817344 100644
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -19,6 +19,20 @@
# /etc/init.d/ambari-agent
+VERSION="${ambariVersion}"
+HASH="${buildNumber}"
+
+case "$1" in
+ --version)
+ echo -e $VERSION
+ exit 0
+ ;;
+ --hash)
+ echo -e $HASH
+ exit 0
+ ;;
+esac
+
export PATH=/usr/lib/ambari-server/*:$PATH
export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5cd2cde2/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index eb9b0fd..8681420 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -262,6 +262,7 @@
<sources>
<source>
<location>conf/unix/ambari-agent</location>
+ <filter>true</filter>
</source>
</sources>
</mapping>
@@ -380,6 +381,22 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>${buildnumber-maven-plugin-version}</version>
+ <configuration>
+ <urlScm>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ambari.git</urlScm>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<extensions>
<extension>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5cd2cde2/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 6d4170a..6cae909 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -224,6 +224,7 @@
</source>
<source>
<location>sbin/ambari-server</location>
+ <filter>true</filter>
</source>
</sources>
</mapping>
@@ -453,6 +454,22 @@
</configuration>
-->
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>${buildnumber-maven-plugin-version}</version>
+ <configuration>
+ <urlScm>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-ambari.git</urlScm>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5cd2cde2/ambari-server/sbin/ambari-server
----------------------------------------------------------------------
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index 96761fa..6de9c67 100644
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -21,6 +21,20 @@
# /etc/init.d/ambari-server
+VERSION="${ambariVersion}"
+HASH="${buildNumber}"
+
+case "$1" in
+ --version)
+ echo -e $VERSION
+ exit 0
+ ;;
+ --hash)
+ echo -e $HASH
+ exit 0
+ ;;
+esac
+
export PATH=/usr/lib/ambari-server/*:$PATH
export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5cd2cde2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 720b590..aa856fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<clover.license>${user.home}/clover.license</clover.license>
+ <buildnumber-maven-plugin-version>1.2</buildnumber-maven-plugin-version>
</properties>
<pluginRepositories>
<pluginRepository>