Repository: ambari Updated Branches: refs/heads/trunk 44ce2e7b6 -> e3415f2dd
AMBARI-5741 - Build is broken with views build not working. - 2 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e3415f2d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e3415f2d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e3415f2d Branch: refs/heads/trunk Commit: e3415f2dd9756a368faf10e8f0ace62952548f4f Parents: 44ce2e7 Author: tbeerbower <tbeerbo...@hortonworks.com> Authored: Mon May 12 18:38:08 2014 -0400 Committer: tbeerbower <tbeerbo...@hortonworks.com> Committed: Mon May 12 18:38:08 2014 -0400 ---------------------------------------------------------------------- ambari-server/pom.xml | 2 +- contrib/views/files/pom.xml | 39 +++++++++++++++++++++++++++++++ contrib/views/pig/pom.xml | 41 ++++++++++++++++++++++++++++++-- contrib/views/pom.xml | 50 +--------------------------------------- 4 files changed, 80 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e3415f2d/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index f5aa263..8997d83 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -251,7 +251,7 @@ <sources> <source> <location> - ${project.basedir}/../contrib/views/target/views + ${project.basedir}/../contrib/views/target </location> <includes> <include>*.jar</include> http://git-wip-us.apache.org/repos/asf/ambari/blob/e3415f2d/contrib/views/files/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index 4747109..18232c4 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -281,4 +281,43 @@ </plugins> </pluginManagement> </build> + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <!-- Copy only the contrib views that we want included for default deployment --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-amabri-views</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <!-- View archives in ../target will be deployed with an Ambari server install --> + <outputDirectory>${basedir}/../target</outputDirectory> + <resources> + <resource> + <directory>${basedir}/target/</directory> + <includes> + <include>*-dependencies.jar</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/ambari/blob/e3415f2d/contrib/views/pig/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index aa844f9..4a0b29b 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -217,6 +217,43 @@ </resource> </resources> </build> - - + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <!-- Copy only the contrib views that we want included for default deployment --> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-amabri-views</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <!-- View archives in ../target will be deployed with an Ambari server install --> + <outputDirectory>${basedir}/../target</outputDirectory> + <resources> + <resource> + <directory>${basedir}/target/</directory> + <includes> + <include>*-dependencies.jar</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/ambari/blob/e3415f2d/contrib/views/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml index d984329..215c99a 100644 --- a/contrib/views/pom.xml +++ b/contrib/views/pom.xml @@ -71,7 +71,7 @@ <!-- unbinds rpm creation from maven lifecycle --> <phase>none</phase> <goals> - <goal>attached-rpm</goal> + <goal>rpm</goal> </goals> </execution> </executions> @@ -84,54 +84,6 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <!-- Copy only the contrib views that we want included for default deployment --> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-amabri-views</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <!-- View archives in target/views will be deployed with an Ambari server install --> - <outputDirectory>${basedir}/target/views</outputDirectory> - <resources> - <!-- PIG view --> - <resource> - <directory>${basedir}/pig/target/</directory> - <includes> - <include>*-dependencies.jar</include> - </includes> - <filtering>true</filtering> - </resource> - <!-- FILES view --> - <resource> - <directory>${basedir}/files/target/</directory> - <includes> - <include>*-dependencies.jar</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> <dependencyManagement> <dependencies> <dependency>