Repository: ambari Updated Branches: refs/heads/trunk acbe6f108 -> 24a7e6442
AMBARI-9808. Allow the user to build ambari-views/examples without having to building the whole Ambari project (pull dependencies from Maven). (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24a7e644 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24a7e644 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24a7e644 Branch: refs/heads/trunk Commit: 24a7e6442b765ea7e817533714ccc98c3e8ff9e4 Parents: acbe6f1 Author: Yusaku Sako <[email protected]> Authored: Wed Feb 25 22:23:51 2015 -0800 Committer: Yusaku Sako <[email protected]> Committed: Thu Feb 26 10:54:36 2015 -0800 ---------------------------------------------------------------------- ambari-views/examples/calculator-view/pom.xml | 5 ++++- ambari-views/examples/favorite-view/pom.xml | 5 ++++- ambari-views/examples/hello-servlet-view/pom.xml | 6 +++++- ambari-views/examples/helloworld-view/pom.xml | 6 +++++- ambari-views/examples/phone-list-view/pom.xml | 5 ++++- ambari-views/examples/pom.xml | 11 ++++++++++- ambari-views/examples/property-validator-view/pom.xml | 5 ++++- ambari-views/examples/property-view/pom.xml | 3 +++ ambari-views/examples/restricted-view/pom.xml | 5 ++++- ambari-views/examples/simple-view/pom.xml | 3 +++ ambari-views/examples/weather-view/pom.xml | 5 ++++- 11 files changed, 50 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/calculator-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/calculator-view/pom.xml b/ambari-views/examples/calculator-view/pom.xml index dededf9..313945b 100644 --- a/ambari-views/examples/calculator-view/pom.xml +++ b/ambari-views/examples/calculator-view/pom.xml @@ -19,13 +19,16 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>calculator-view</artifactId> <packaging>jar</packaging> <name>Ambari Calculator View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/favorite-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/favorite-view/pom.xml b/ambari-views/examples/favorite-view/pom.xml index edd7759..3ce5d12 100644 --- a/ambari-views/examples/favorite-view/pom.xml +++ b/ambari-views/examples/favorite-view/pom.xml @@ -19,13 +19,16 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>favorite-view</artifactId> <packaging>jar</packaging> <name>Ambari Favorite View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/hello-servlet-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/hello-servlet-view/pom.xml b/ambari-views/examples/hello-servlet-view/pom.xml index b116807..fd6a21c 100644 --- a/ambari-views/examples/hello-servlet-view/pom.xml +++ b/ambari-views/examples/hello-servlet-view/pom.xml @@ -19,13 +19,17 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hello-servlet-view</artifactId> <packaging>jar</packaging> <name>Ambari Hello Servlet View</name> + <version>2.0.0-SNAPSHOT</version> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/helloworld-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/helloworld-view/pom.xml b/ambari-views/examples/helloworld-view/pom.xml index 6a7f75f..b5607ca 100644 --- a/ambari-views/examples/helloworld-view/pom.xml +++ b/ambari-views/examples/helloworld-view/pom.xml @@ -19,13 +19,17 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>helloworld-view</artifactId> <packaging>jar</packaging> <name>Ambari Hello World View</name> + <version>2.0.0-SNAPSHOT</version> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/phone-list-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/phone-list-view/pom.xml b/ambari-views/examples/phone-list-view/pom.xml index bb19067..ec8f956 100644 --- a/ambari-views/examples/phone-list-view/pom.xml +++ b/ambari-views/examples/phone-list-view/pom.xml @@ -19,13 +19,16 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>phone-list-view</artifactId> <packaging>jar</packaging> <name>Ambari Phone List View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/pom.xml b/ambari-views/examples/pom.xml index 4e93c35..4751093 100644 --- a/ambari-views/examples/pom.xml +++ b/ambari-views/examples/pom.xml @@ -16,12 +16,18 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <parent> + <groupId>org.apache.ambari</groupId> + <artifactId>ambari-project</artifactId> + <version>2.0.0-SNAPSHOT</version> + <relativePath>../../ambari-project</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> <packaging>pom</packaging> - <version>1.0.0</version> <name>Ambari View Examples</name> + <version>2.0.0-SNAPSHOT</version> <modules> <module>helloworld-view</module> <module>hello-servlet-view</module> @@ -31,6 +37,9 @@ <module>weather-view</module> <module>restricted-view</module> </modules> + <properties> + <ambari.dir>${project.parent.parent.basedir}</ambari.dir> + </properties> <build> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/property-validator-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/property-validator-view/pom.xml b/ambari-views/examples/property-validator-view/pom.xml index 57e2df3..87f08cc 100644 --- a/ambari-views/examples/property-validator-view/pom.xml +++ b/ambari-views/examples/property-validator-view/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>property-validator-view</artifactId> @@ -27,6 +27,9 @@ <packaging>jar</packaging> <name>Ambari Property Validator View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>org.apache.ambari</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/property-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/property-view/pom.xml b/ambari-views/examples/property-view/pom.xml index 9f8503b..3194227 100644 --- a/ambari-views/examples/property-view/pom.xml +++ b/ambari-views/examples/property-view/pom.xml @@ -27,6 +27,9 @@ <packaging>jar</packaging> <name>Ambari Property View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>org.apache.ambari</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/restricted-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/restricted-view/pom.xml b/ambari-views/examples/restricted-view/pom.xml index be7ad7f..347212b 100644 --- a/ambari-views/examples/restricted-view/pom.xml +++ b/ambari-views/examples/restricted-view/pom.xml @@ -19,13 +19,16 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>restricted-view</artifactId> <packaging>jar</packaging> <name>Ambari Restricted View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/simple-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/simple-view/pom.xml b/ambari-views/examples/simple-view/pom.xml index 453fde2..83df882 100644 --- a/ambari-views/examples/simple-view/pom.xml +++ b/ambari-views/examples/simple-view/pom.xml @@ -27,6 +27,9 @@ <packaging>jar</packaging> <name>Ambari Simple View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>org.apache.ambari</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/24a7e644/ambari-views/examples/weather-view/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-views/examples/weather-view/pom.xml b/ambari-views/examples/weather-view/pom.xml index d9136e2..d16ae77 100644 --- a/ambari-views/examples/weather-view/pom.xml +++ b/ambari-views/examples/weather-view/pom.xml @@ -19,13 +19,16 @@ <parent> <groupId>org.apache.ambari</groupId> <artifactId>ambari-view-examples</artifactId> - <version>1.0.0</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>weather-view</artifactId> <packaging>jar</packaging> <name>Ambari Weather View</name> <url>http://maven.apache.org</url> + <properties> + <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir> + </properties> <dependencies> <dependency> <groupId>junit</groupId>
