You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/01/16 12:35:34 UTC

[2/2] ambari git commit: AMBARI-19565. Ambari-agent: /var/lib/ambari-agent/cred/lib is not created and populated with credential store JARs and dependencies (aonishuk)

AMBARI-19565. Ambari-agent: /var/lib/ambari-agent/cred/lib is not created and populated with credential store JARs and dependencies (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2dca96a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2dca96a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2dca96a5

Branch: refs/heads/branch-2.5
Commit: 2dca96a529f00d5770c1b2cef9b654e70b37ec60
Parents: 930d5bf
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Jan 16 14:35:11 2017 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Jan 16 14:35:11 2017 +0200

----------------------------------------------------------------------
 ambari-agent/pom.xml                      | 27 ++++++++++++++
 ambari-agent/src/packages/tarball/all.xml | 49 ++++++++++----------------
 2 files changed, 46 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2dca96a5/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 510f6f6..5051467 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -63,6 +63,33 @@
       <version>1.3.1</version>
     </dependency>
     <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.6</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>2.7.3</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-test</artifactId>
       <version>2.9.0</version>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2dca96a5/ambari-agent/src/packages/tarball/all.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/src/packages/tarball/all.xml b/ambari-agent/src/packages/tarball/all.xml
index f8a54e3..e88d3bc 100644
--- a/ambari-agent/src/packages/tarball/all.xml
+++ b/ambari-agent/src/packages/tarball/all.xml
@@ -190,34 +190,23 @@
       <outputDirectory>/var/lib/${project.artifactId}/data</outputDirectory>
     </file>
   </files>
-  <moduleSets>
-    <moduleSet>
-      <binaries>
-        <includeDependencies>false</includeDependencies>
-        <outputDirectory>/var/lib/${project.artifactId}/cred/lib</outputDirectory>
-        <unpack>false</unpack>
-        <directoryMode>755</directoryMode>
-        <fileMode>644</fileMode>
-        <dependencySets>
-          <dependencySet>
-            <outputDirectory>/var/lib/${project.artifactId}/cred/lib</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-              <include>commons-cli:commons-cli</include>
-              <include>commons-collections:commons-collections</include>
-              <include>commons-configuration:commons-configuration</include>
-              <include>commons-io:commons-io:jar:${commons.io.version}</include>
-              <include>commons-lang:commons-lang</include>
-              <include>commons-logging:commons-logging</include>
-              <include>com.google.guava:guava</include>
-              <include>org.slf4j:slf4j-api</include>
-              <include>org.apache.hadoop:hadoop-common</include>
-              <include>org.apache.hadoop:hadoop-auth</include>
-              <include>org.apache.htrace:htrace-core</include>
-            </includes>
-          </dependencySet>
-        </dependencySets>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/var/lib/${project.artifactId}/cred/lib</outputDirectory>
+      <unpack>false</unpack>
+      <includes>
+        <include>commons-cli:commons-cli</include>
+        <include>commons-collections:commons-collections</include>
+        <include>commons-configuration:commons-configuration</include>
+        <include>commons-io:commons-io</include>
+        <include>commons-lang:commons-lang</include>
+        <include>commons-logging:commons-logging</include>
+        <include>com.google.guava:guava</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>org.apache.hadoop:hadoop-common</include>
+        <include>org.apache.hadoop:hadoop-auth</include>
+        <include>org.apache.htrace:htrace-core</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
 </assembly>