You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2017/02/24 00:00:01 UTC
ambari git commit: AMBARI-20154. Package clean up.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 016c7ac48 -> 3779ac40c
AMBARI-20154. Package clean up.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3779ac40
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3779ac40
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3779ac40
Branch: refs/heads/branch-2.5
Commit: 3779ac40c510d428779d5b8387ff98387b19bee4
Parents: 016c7ac
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Feb 24 01:02:45 2017 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Feb 24 01:02:45 2017 +0200
----------------------------------------------------------------------
.../src/main/assembly/collector.xml | 2 ++
.../ambari-metrics-assembly/src/main/assembly/sink.xml | 5 +++++
.../src/main/assemblies/jar-with-common.xml | 1 +
.../src/main/assemblies/jar-with-common.xml | 1 +
.../src/main/assemblies/jar-with-common.xml | 1 +
.../src/main/assemblies/simulator.xml | 2 ++
ambari-server/src/main/assemblies/server.xml | 11 +++++++++++
7 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3779ac40/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
index 7f338be..aab3618 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
@@ -60,6 +60,7 @@
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<unpack>false</unpack>
<outputDirectory>hbase/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
@@ -69,6 +70,7 @@
</includes>
</dependencySet>
<dependencySet>
+ <fileMode>755</fileMode>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3779ac40/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
index ec3a55a..35e0b47 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/sink.xml
@@ -50,22 +50,27 @@
<files>
<file>
+ <fileMode>755</fileMode>
<source>${hadoop-sink.dir}/target/ambari-metrics-hadoop-sink-with-common-${project.version}.jar</source>
<outputDirectory>hadoop-sink</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${flume-sink.dir}/target/ambari-metrics-flume-sink-with-common-${project.version}.jar</source>
<outputDirectory>hadoop-sink</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${storm-sink.dir}/target/ambari-metrics-storm-sink-with-common-${project.version}.jar</source>
<outputDirectory>hadoop-sink</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${storm-sink-legacy.dir}/target/ambari-metrics-storm-sink-legacy-with-common-${project.version}.jar</source>
<outputDirectory>hadoop-sink</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${kafka-sink.dir}/target/ambari-metrics-kafka-sink-with-common-${project.version}.jar</source>
<outputDirectory>hadoop-sink</outputDirectory>
</file>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3779ac40/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml b/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
index b2351e0..cef956c 100644
--- a/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
+++ b/ambari-metrics/ambari-metrics-flume-sink/src/main/assemblies/jar-with-common.xml
@@ -23,6 +23,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
<includes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3779ac40/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
index 5cee0c9..058a8bb 100644
--- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
+++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/assemblies/jar-with-common.xml
@@ -26,6 +26,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
<includes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3779ac40/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml b/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
index 4fa8585..7eb9774 100644
--- a/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
+++ b/ambari-metrics/ambari-metrics-kafka-sink/src/main/assemblies/jar-with-common.xml
@@ -23,6 +23,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
<includes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3779ac40/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml b/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
index 0f77976..b582096 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/assemblies/simulator.xml
@@ -24,6 +24,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
+ <fileMode>755</fileMode>
<source>${project.build.directory}/${artifact.artifactId}-simulator-${artifact.version}.jar</source>
<outputDirectory>ambari-metrics-${project.version}/lib/ambari-metrics</outputDirectory>
</file>
@@ -55,6 +56,7 @@
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<outputDirectory>ambari-metrics-${project.version}/lib/ambari-metrics</outputDirectory>
<!--
<useProjectArtifact>false</useProjectArtifact>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3779ac40/ambari-server/src/main/assemblies/server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml
index ba5b096..29739cd 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -181,6 +181,7 @@
<outputDirectory>/var/lib/ambari-server/resources/host_scripts</outputDirectory>
</fileSet>
<fileSet>
+ <fileMode>755</fileMode>
<directory>etc/init</directory>
<outputDirectory>/etc/init</outputDirectory>
</fileSet>
@@ -199,6 +200,7 @@
-->
<files>
<file>
+ <fileMode>755</fileMode>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
<outputDirectory>/usr/lib/ambari-server</outputDirectory>
</file>
@@ -218,18 +220,22 @@
<outputDirectory>/etc/init.d</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${ambariProperties}</source>
<outputDirectory>/etc/ambari-server/conf</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>conf/unix/log4j.properties</source>
<outputDirectory>/etc/ambari-server/conf</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>conf/unix/metrics.properties</source>
<outputDirectory>/etc/ambari-server/conf</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>conf/unix/krb5JAASLogin.conf</source>
<outputDirectory>/etc/ambari-server/conf</outputDirectory>
</file>
@@ -254,6 +260,7 @@
<outputDirectory>/var/lib/ambari-server/</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>conf/unix/ca.config</source>
<outputDirectory>/var/lib/ambari-server/keys</outputDirectory>
</file>
@@ -328,10 +335,12 @@
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${project.build.directory}/CredentialUtil.jar</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>src/main/resources/APACHE-AMBARI-MIB.txt</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
@@ -370,6 +379,7 @@
<outputDirectory>/usr/lib/python2.6/site-packages/ambari_server</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${basedir}/target/version</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
@@ -381,6 +391,7 @@
</files>
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<outputDirectory>/usr/lib/ambari-server</outputDirectory>
<unpack>false</unpack>
<scope>compile</scope>