You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/01/02 15:02:05 UTC
ambari git commit: AMBARI-8968. Services metrics do not load due to
symlink to ambari-metrics-hadoop-sink not created. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 16d0a86c1 -> 1cb1d211f
AMBARI-8968. Services metrics do not load due to symlink to ambari-metrics-hadoop-sink not created. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cb1d211
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cb1d211
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cb1d211
Branch: refs/heads/trunk
Commit: 1cb1d211f3c90f02f6d6c16c9777e7d949375dc4
Parents: 16d0a86
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Wed Dec 31 18:14:28 2014 +0200
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Jan 2 16:01:49 2015 +0200
----------------------------------------------------------------------
ambari-metrics/ambari-metrics-assembly/pom.xml | 93 +++++++++++++--------
1 file changed, 58 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cb1d211/ambari-metrics/ambari-metrics-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 0a47b8a..10fbab9 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -75,39 +75,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
-
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/deb/control</outputDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/package/deb/control</directory>
- <excludes>
- <exclude>postinst</exclude>
- </excludes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.basedir}/src/main/package/deb/control</directory>
- <includes>
- <include>postinst</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -176,6 +143,29 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/resources/rpm</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/package/rpm</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
<version>2.0.1</version>
@@ -435,7 +425,7 @@
<defaultGroupname>root</defaultGroupname>
<postinstallScriptlet>
- <scriptFile>${project.basedir}/src/main/package/rpm/sink/postinstall.sh</scriptFile>
+ <scriptFile>${project.build.directory}/resources/rpm/sink/postinstall.sh</scriptFile>
<fileEncoding>utf-8</fileEncoding>
</postinstallScriptlet>
@@ -487,6 +477,39 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/resources/deb/control</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/package/deb/control</directory>
+ <excludes>
+ <exclude>postinst</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/src/main/package/deb/control</directory>
+ <includes>
+ <include>postinst</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>1.0.1</version>
@@ -500,7 +523,7 @@
</execution>
</executions>
<configuration>
- <controlDir>${project.build.directory}/deb/control</controlDir>
+ <controlDir>${project.build.directory}/resources/deb/control</controlDir>
<deb>${basedir}/target/${artifactId}_${package-version}-${package-release}.deb</deb>
<dataSet>
<data>