You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/29 14:14:21 UTC
[09/16] git commit: AMBARI-7291. Create different Maven profiles to
build Bigtop, HDP and PHD stacks. (Alex Newton via mahadev)
AMBARI-7291. Create different Maven profiles to build Bigtop, HDP and PHD stacks. (Alex Newton via mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcedac20
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcedac20
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcedac20
Branch: refs/heads/branch-alerts-dev
Commit: dcedac20674ba278b764cacd569e40c0c12d7278
Parents: 62a50a6
Author: Mahadev Konar <ma...@apache.org>
Authored: Fri Sep 26 15:31:05 2014 -0700
Committer: Mahadev Konar <ma...@apache.org>
Committed: Fri Sep 26 15:31:05 2014 -0700
----------------------------------------------------------------------
ambari-agent/pom.xml | 3 ++-
ambari-server/pom.xml | 8 ++++----
ambari-server/src/main/assemblies/server.xml | 3 ++-
pom.xml | 1 +
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcedac20/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index f226748..3761649 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -583,7 +583,8 @@
<resource>
<directory>${ambari.server.module}/src/main/resources</directory>
<includes>
- <include>stacks/**/*</include>
+ <include>stacks/stack_advisor.py</include>
+ <include>stacks/${stack.distribution}/**/*</include>
<include>custom_actions/**/*</include>
</includes>
<filtering>false</filtering>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcedac20/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 6287cdb..0fc41aa 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -480,10 +480,10 @@
</sources>
</mapping>
<mapping>
- <directory>/var/lib/ambari-server/resources/stacks/HDP</directory>
+ <directory>/var/lib/ambari-server/resources/stacks/${stack.distribution}</directory>
<sources>
<source>
- <location>target/classes/stacks/HDP</location>
+ <location>target/classes/stacks/${stack.distribution}</location>
</source>
</sources>
</mapping>
@@ -843,11 +843,11 @@
</mapper>
</data>
<data>
- <src>target/classes/stacks/HDP</src>
+ <src>target/classes/stacks/${stack.distribution}</src>
<type>directory</type>
<mapper>
<type>perm</type>
- <prefix>/var/lib/ambari-server/resources/stacks/HDP</prefix>
+ <prefix>/var/lib/ambari-server/resources/stacks/${stack.distribution}</prefix>
</mapper>
</data>
<data>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcedac20/ambari-server/src/main/assemblies/server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml
index 83800e4..a5a1f79 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -93,7 +93,8 @@
<directory>src/main/resources</directory>
<outputDirectory>/ambari-server-${project.version}/var/lib/ambari-server/resources/</outputDirectory>
<includes>
- <include>stacks/**</include>
+ <include>stacks/stack_advisor.py</include>
+ <include>stacks/${stack.distribution}/**</include>
</includes>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcedac20/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb47889..3db2d00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
<deb.section>universe/admin</deb.section>
<deb.architecture>i386 amd64</deb.architecture>
<deb.priority>extra</deb.priority>
+ <stack.distribution>BIGTOP</stack.distribution>
</properties>
<pluginRepositories>
<pluginRepository>