Repository: ambari Updated Branches: refs/heads/trunk db80f976d -> bc0be1443
AMBARI-17150 : Ambari Metrics components packages do not have vendor before upgrade, but for new versions it appears (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc0be144 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc0be144 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc0be144 Branch: refs/heads/trunk Commit: bc0be1443daaf7966174ba7daf0c2d07db8414be Parents: db80f97 Author: Aravindan Vijayan <[email protected]> Authored: Wed Jun 15 15:14:56 2016 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Wed Jun 15 15:15:02 2016 -0700 ---------------------------------------------------------------------- ambari-metrics/ambari-metrics-common/pom.xml | 17 ----------------- ambari-metrics/pom.xml | 12 +++++------- 2 files changed, 5 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bc0be144/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 41ba62e..3e11e7f 100644 --- a/ambari-metrics/ambari-metrics-common/pom.xml +++ b/ambari-metrics/ambari-metrics-common/pom.xml @@ -53,23 +53,6 @@ <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/bc0be144/ambari-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml index 1f87683..b216635 100644 --- a/ambari-metrics/pom.xml +++ b/ambari-metrics/pom.xml @@ -15,12 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --><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/xsd/maven-4.0.0.xsd";> - <parent> - <groupId>org.apache.ambari</groupId> - <artifactId>ambari-project</artifactId> - <version>2.0.0.0-SNAPSHOT</version> - <relativePath>../ambari-project</relativePath> - </parent> <groupId>org.apache.ambari</groupId> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-metrics</artifactId> @@ -113,6 +107,11 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19</version> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.8</version> @@ -140,7 +139,6 @@ </executions> </plugin> <plugin> - <inherited>false</inherited> <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors>
