You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/12/17 20:20:34 UTC
ambari git commit: AMBARI-14346: Add parent tag to
ambari-metrics/pom.xml (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 52d1a911e -> d67270f67
AMBARI-14346: Add parent tag to ambari-metrics/pom.xml (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d67270f6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d67270f6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d67270f6
Branch: refs/heads/trunk
Commit: d67270f67f3a1a3db4581543d2f5dd521dca88cf
Parents: 52d1a91
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Dec 17 11:19:51 2015 -0800
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Dec 17 11:19:51 2015 -0800
----------------------------------------------------------------------
ambari-metrics/ambari-metrics-common/pom.xml | 17 +++++++++++++++++
ambari-metrics/pom.xml | 1 +
ambari-project/pom.xml | 1 -
ambari-views/examples/auto-cluster-view/pom.xml | 1 -
ambari-views/examples/calculator-view/pom.xml | 1 -
ambari-views/examples/cluster-view/pom.xml | 1 -
ambari-views/examples/favorite-view/pom.xml | 1 -
ambari-views/examples/hello-servlet-view/pom.xml | 1 -
ambari-views/examples/hello-spring-view/pom.xml | 1 -
ambari-views/examples/helloworld-view/pom.xml | 1 -
ambari-views/examples/phone-list-view/pom.xml | 1 -
.../examples/property-validator-view/pom.xml | 1 -
ambari-views/examples/property-view/pom.xml | 1 -
ambari-views/examples/restricted-view/pom.xml | 1 -
ambari-views/examples/simple-view/pom.xml | 1 -
ambari-views/examples/weather-view/pom.xml | 1 -
contrib/ambari-scom/ambari-scom-server/pom.xml | 2 +-
contrib/ambari-scom/metrics-sink/pom.xml | 2 +-
18 files changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/ambari-metrics/ambari-metrics-common/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-common/pom.xml b/ambari-metrics/ambari-metrics-common/pom.xml
index d045ebc..5a388dd 100644
--- a/ambari-metrics/ambari-metrics-common/pom.xml
+++ b/ambari-metrics/ambari-metrics-common/pom.xml
@@ -53,6 +53,23 @@
<controlDir>${project.basedir}/../src/main/package/deb/control</controlDir>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>../../ambari-project/src/main/assemblies/empty.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-tarball</id>
+ <phase>none</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/ambari-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 339c822..44964d4 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -137,6 +137,7 @@
</executions>
</plugin>
<plugin>
+ <inherited>false</inherited>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 7410a7a..68bdb94 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -480,7 +480,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/ambari-views/examples/auto-cluster-view/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/examples/auto-cluster-view/pom.xml b/ambari-views/examples/auto-cluster-view/pom.xml
index 867fa09..8689365 100644
--- a/ambari-views/examples/auto-cluster-view/pom.xml
+++ b/ambari-views/examples/auto-cluster-view/pom.xml
@@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 313945b..d5e0e8e 100644
--- a/ambari-views/examples/calculator-view/pom.xml
+++ b/ambari-views/examples/calculator-view/pom.xml
@@ -65,7 +65,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/ambari-views/examples/cluster-view/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/examples/cluster-view/pom.xml b/ambari-views/examples/cluster-view/pom.xml
index b0815b2..99582a6 100644
--- a/ambari-views/examples/cluster-view/pom.xml
+++ b/ambari-views/examples/cluster-view/pom.xml
@@ -60,7 +60,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 3ce5d12..ba196f5 100644
--- a/ambari-views/examples/favorite-view/pom.xml
+++ b/ambari-views/examples/favorite-view/pom.xml
@@ -65,7 +65,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 fd6a21c..ed6fc25 100644
--- a/ambari-views/examples/hello-servlet-view/pom.xml
+++ b/ambari-views/examples/hello-servlet-view/pom.xml
@@ -67,7 +67,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/ambari-views/examples/hello-spring-view/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-views/examples/hello-spring-view/pom.xml b/ambari-views/examples/hello-spring-view/pom.xml
index 833e25c..3475ef4 100644
--- a/ambari-views/examples/hello-spring-view/pom.xml
+++ b/ambari-views/examples/hello-spring-view/pom.xml
@@ -98,7 +98,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 b5607ca..aa89778 100644
--- a/ambari-views/examples/helloworld-view/pom.xml
+++ b/ambari-views/examples/helloworld-view/pom.xml
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 ec8f956..ead9095 100644
--- a/ambari-views/examples/phone-list-view/pom.xml
+++ b/ambari-views/examples/phone-list-view/pom.xml
@@ -66,7 +66,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 cb529d7..045a277 100644
--- a/ambari-views/examples/property-validator-view/pom.xml
+++ b/ambari-views/examples/property-validator-view/pom.xml
@@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 b50cb69..ad4630b 100644
--- a/ambari-views/examples/property-view/pom.xml
+++ b/ambari-views/examples/property-view/pom.xml
@@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 347212b..f7fa3d6 100644
--- a/ambari-views/examples/restricted-view/pom.xml
+++ b/ambari-views/examples/restricted-view/pom.xml
@@ -65,7 +65,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 b1d221e..015f192 100644
--- a/ambari-views/examples/simple-view/pom.xml
+++ b/ambari-views/examples/simple-view/pom.xml
@@ -54,7 +54,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/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 d16ae77..a018258 100644
--- a/ambari-views/examples/weather-view/pom.xml
+++ b/ambari-views/examples/weather-view/pom.xml
@@ -91,7 +91,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/contrib/ambari-scom/ambari-scom-server/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/ambari-scom-server/pom.xml b/contrib/ambari-scom/ambari-scom-server/pom.xml
index 59d13d9..3ea61a8 100644
--- a/contrib/ambari-scom/ambari-scom-server/pom.xml
+++ b/contrib/ambari-scom/ambari-scom-server/pom.xml
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.19</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d67270f6/contrib/ambari-scom/metrics-sink/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/metrics-sink/pom.xml b/contrib/ambari-scom/metrics-sink/pom.xml
index bb378a0..274f70a 100644
--- a/contrib/ambari-scom/metrics-sink/pom.xml
+++ b/contrib/ambari-scom/metrics-sink/pom.xml
@@ -118,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>2.19</version>
</plugin>
</plugins>
</pluginManagement>