You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by wu...@apache.org on 2023/02/20 08:30:21 UTC
[ambari-metrics] branch master updated: AMBARI-25840: Optimize rpm package for Ambari Metric Collector (#97)
This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-metrics.git
The following commit(s) were added to refs/heads/master by this push:
new 86beb2f AMBARI-25840: Optimize rpm package for Ambari Metric Collector (#97)
86beb2f is described below
commit 86beb2faf547d799c192933cec1c1f6d99ee82b1
Author: Yu Hou <52...@qq.com>
AuthorDate: Mon Feb 20 16:30:16 2023 +0800
AMBARI-25840: Optimize rpm package for Ambari Metric Collector (#97)
---
ambari-metrics-assembly/pom.xml | 58 +++++++++++++++++++++++++++--------------
1 file changed, 39 insertions(+), 19 deletions(-)
diff --git a/ambari-metrics-assembly/pom.xml b/ambari-metrics-assembly/pom.xml
index 7597158..e6db31c 100644
--- a/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics-assembly/pom.xml
@@ -247,6 +247,8 @@
<exclude>*tests.jar</exclude>
<exclude>findbugs*.jar</exclude>
<exclude>jdk.tools*.jar</exclude>
+ <exclude>hadoop*.jar</exclude>
+ <exclude>hbase*.jar</exclude>
</excludes>
</source>
<source>
@@ -254,6 +256,13 @@
${collector.dir}/target/ambari-metrics-timelineservice-${project.version}.jar
</location>
</source>
+ <source>
+ <location>${collector.dir}/target/embedded/${hbase.folder}/lib</location>
+ <includes>
+ <include>hadoop*.jar</include>
+ <include>hbase*.jar</include>
+ </includes>
+ </source>
</sources>
</mapping>
<mapping>
@@ -270,8 +279,10 @@
<exclude>lib/jdk.tools*.jar</exclude>
<!-- hadoop, guava and commons-beanutils are excluded because they will be replaced with different versions -->
<exclude>lib/hadoop*.jar</exclude>
- <exclude>lib/guava-11.0.2.jar</exclude>
- <exclude>lib/commons-beanutils-core-1.8.0.jar</exclude>
+ <exclude>lib/guava*.jar</exclude>
+ <exclude>lib/commons-beanutils*.jar</exclude>
+ <exclude>docs/*</exclude>
+ <exclude>docs/**</exclude>
</excludes>
</source>
</sources>
@@ -281,6 +292,13 @@
<directory>/usr/lib/ams-hbase/lib/</directory>
<directoryIncluded>false</directoryIncluded>
<sources>
+ <source>
+ <location>${project.build.directory}/embedded/${hadoop.folder}/share/hadoop/common</location>
+ <includes>
+ <include>hadoop-common-${hadoop.version}.jar</include>
+ <include>hadoop-registry-${hadoop.version}.jar</include>
+ </includes>
+ </source>
<source>
<location>${project.build.directory}/embedded/${hadoop.folder}/share/hadoop/hdfs</location>
<includes>
@@ -300,8 +318,24 @@
<source>
<location>${project.build.directory}/embedded/${hadoop.folder}/share/hadoop/tools/lib</location>
<includes>
- <include>hadoop-aws*.jar</include>
- <include>hadoop-distcp-*.jar</include>
+ <include>hadoop-aws-${hadoop.version}.jar</include>
+ <include>hadoop-distcp-${hadoop.version}.jar</include>
+ <include>hadoop-client-${hadoop.version}.jar</include>
+ </includes>
+ </source>
+ <source>
+ <location>${project.build.directory}/embedded/${hadoop.folder}/share/hadoop/yarn</location>
+ <includes>
+ <include>hadoop-yarn-api-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-client-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-common-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-registry-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-server-applicationhistoryservice-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-server-common-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-server-nodemanager-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-server-resourcemanager-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-server-timelineservice-${hadoop.version}.jar</include>
+ <include>hadoop-yarn-server-web-proxy-${hadoop.version}.jar</include>
</includes>
</source>
<source>
@@ -335,24 +369,10 @@
<include>phoenix*.jar</include>
<include>antlr*.jar</include>
<include>re2j*.jar</include>
- <include>failureaccess*.jar</include>
- <include>guava-28*.jar</include>
+ <include>guava-*.jar</include>
<include>stax2-api*.jar</include>
<include>woodstox-core*.jar</include>
- <include>hadoop-annotations-${hadoop.version}.jar</include>
- <include>hadoop-auth-${hadoop.version}.jar</include>
- <include>hadoop-common-${hadoop.version}.jar</include>
<include>commons-configuration2-*.jar</include>
- <include>hadoop-yarn-api-${hadoop.version}.jar</include>
- <include>hadoop-yarn-client-${hadoop.version}.jar</include>
- <include>hadoop-yarn-common-${hadoop.version}.jar</include>
- <include>hadoop-yarn-registry-${hadoop.version}.jar</include>
- <include>hadoop-yarn-server-applicationhistoryservice-${hadoop.version}.jar</include>
- <include>hadoop-yarn-server-common-${hadoop.version}.jar</include>
- <include>hadoop-yarn-server-nodemanager-${hadoop.version}.jar</include>
- <include>hadoop-yarn-server-resourcemanager-${hadoop.version}.jar</include>
- <include>hadoop-yarn-server-timelineservice-${hadoop.version}.jar</include>
- <include>hadoop-yarn-server-web-proxy-${hadoop.version}.jar</include>
</includes>
</source>
</sources>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org