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/04/20 21:26:12 UTC
ambari git commit: AMBARI-20154. CLONE - Ensure all dependency jars
and stack contents within /usr/lib/ambari-server are with permission
755.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 8bbf68c5a -> 9ca96f13c
AMBARI-20154. CLONE - Ensure all dependency jars and stack contents within /usr/lib/ambari-server are with permission 755.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ca96f13
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ca96f13
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ca96f13
Branch: refs/heads/branch-2.4
Commit: 9ca96f13cd6a35c31d1d5bd9f662d8d7adf15add
Parents: 8bbf68c
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Apr 21 00:25:16 2017 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Apr 21 00:25:16 2017 +0300
----------------------------------------------------------------------
.../src/main/assembly/collector.xml | 2 ++
.../src/main/assembly/sink.xml | 5 +++++
.../src/main/assemblies/jar-with-common.xml | 1 +
.../src/main/assemblies/jar-with-common.xml | 3 ++-
.../src/main/assemblies/jar-with-common.xml | 1 +
.../src/main/assemblies/simulator.xml | 4 +++-
ambari-server/src/main/assemblies/server.xml | 23 ++++++++++++++++++++
7 files changed, 37 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ca96f13/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 609ddb3..59bb65a 100644
--- a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
+++ b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector.xml
@@ -58,6 +58,7 @@
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<unpack>false</unpack>
<outputDirectory>hbase/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
@@ -67,6 +68,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/9ca96f13/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/9ca96f13/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/9ca96f13/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..4e0c44b 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>
@@ -34,4 +35,4 @@
</includes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ca96f13/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/9ca96f13/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..50beddd 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>
@@ -65,4 +67,4 @@
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9ca96f13/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 1560d8d..84cc784 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -128,6 +128,7 @@
<outputDirectory>/var/lib/ambari-server/resources/scripts</outputDirectory>
</fileSet>
<fileSet>
+ <fileMode>755</fileMode>
<directory>${ambari-admin-dir}/target</directory>
<outputDirectory>/var/lib/ambari-server/resources/views</outputDirectory>
<includes>
@@ -171,6 +172,7 @@
<outputDirectory>/var/lib/ambari-server/resources/host_scripts</outputDirectory>
</fileSet>
<fileSet>
+ <fileMode>755</fileMode>
<directory>etc/init</directory>
<outputDirectory>/etc/init</outputDirectory>
</fileSet>
@@ -189,6 +191,7 @@
-->
<files>
<file>
+ <fileMode>755</fileMode>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
<outputDirectory>/usr/lib/ambari-server</outputDirectory>
</file>
@@ -208,14 +211,17 @@
<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/krb5JAASLogin.conf</source>
<outputDirectory>/etc/ambari-server/conf</outputDirectory>
</file>
@@ -235,62 +241,77 @@
<outputDirectory>/var/lib/ambari-server/</outputDirectory>
</file>
<file>
+ <fileMode>700</fileMode>
<source>conf/unix/ca.config</source>
<outputDirectory>/var/lib/ambari-server/keys</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>target/classes/Ambari-DDL-Postgres-CREATE.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>src/main/resources/Ambari-DDL-Postgres-DROP.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>target/classes/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>src/main/resources/Ambari-DDL-Postgres-EMBEDDED-DROP.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>target/classes/Ambari-DDL-Oracle-CREATE.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>target/classes/Ambari-DDL-MySQL-CREATE.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>src/main/resources/Ambari-DDL-Oracle-DROP.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>src/main/resources/Ambari-DDL-MySQL-DROP.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>target/classes/Ambari-DDL-SQLServer-CREATE.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>target/classes/Ambari-DDL-SQLServer-CREATELOCAL.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>src/main/resources/Ambari-DDL-SQLServer-DROP.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>target/classes/Ambari-DDL-SQLAnywhere-CREATE.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>src/main/resources/Ambari-DDL-SQLAnywhere-DROP.sql</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <fileMode>755</fileMode>
<source>${project.build.directory}/DBConnectionVerification.jar</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
@@ -329,12 +350,14 @@
<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>
</files>
<dependencySets>
<dependencySet>
+ <fileMode>755</fileMode>
<outputDirectory>/usr/lib/ambari-server</outputDirectory>
<unpack>false</unpack>
<scope>compile</scope>