Updated Branches: refs/heads/trunk fb7348909 -> 366a263c4
AMBARI-4238. Unable to install hdp - puppet error.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a30ece3e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a30ece3e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a30ece3e Branch: refs/heads/trunk Commit: a30ece3e0b6907d9f30cc46bac33e345879c7381 Parents: fb73489 Author: Vitaly Brodetskyi <[email protected]> Authored: Wed Jan 8 14:37:25 2014 +0200 Committer: Chad Roberts <[email protected]> Committed: Wed Jan 8 09:29:07 2014 -0500 ---------------------------------------------------------------------- ambari-server/pom.xml | 3 ++- pom.xml | 29 ++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a30ece3e/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index c161486..212b944 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -30,6 +30,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <python.ver>python >= 2.6</python.ver> <hdpUrlForCentos6>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</hdpUrlForCentos6> + <ambari-web-dir>${basedir}/../ambari-web/public</ambari-web-dir> </properties> <build> <plugins> @@ -203,7 +204,7 @@ <directory>/usr/lib/ambari-server/web</directory> <sources> <source> - <location>${basedir}/../ambari-web/public</location> + <location>${ambari-web-dir}</location> <includes> <include>**</include> </includes> http://git-wip-us.apache.org/repos/asf/ambari/blob/a30ece3e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 36af3c1..b8b147e 100644 --- a/pom.xml +++ b/pom.xml @@ -47,13 +47,6 @@ <url>http://download.java.net/maven/glassfish/</url> </pluginRepository> </pluginRepositories> - <modules> - <module>ambari-web</module> - <module>ambari-project</module> - <module>ambari-server</module> - <module>ambari-agent</module> - <module>ambari-client</module> - </modules> <build> <pluginManagement> <plugins> @@ -162,6 +155,28 @@ </build> <profiles> <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>ambari-web</module> + <module>ambari-project</module> + <module>ambari-server</module> + <module>ambari-agent</module> + <module>ambari-client</module> + </modules> + </profile> + <profile> + <id>static-web</id> + <modules> + <module>ambari-project</module> + <module>ambari-server</module> + <module>ambari-agent</module> + <module>ambari-client</module> + </modules> + </profile> + <profile> <id>clover</id> <activation> <activeByDefault>false</activeByDefault>
