You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/02/03 19:35:25 UTC
ambari git commit: AMBARI-19865: Ambari-server logon failure:
Hadoop-common dependency on servlet-api 2.5
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 4dea63774 -> c6663312e
AMBARI-19865: Ambari-server logon failure: Hadoop-common dependency on servlet-api 2.5
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6663312
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6663312
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6663312
Branch: refs/heads/branch-2.5
Commit: c6663312e3e923c60157c59e24228d80bf9df895
Parents: 4dea637
Author: Nahappan Somasundaram <ns...@hortonworks.com>
Authored: Fri Feb 3 07:57:28 2017 -0800
Committer: Nahappan Somasundaram <ns...@hortonworks.com>
Committed: Fri Feb 3 10:38:25 2017 -0800
----------------------------------------------------------------------
ambari-server/pom.xml | 6 ++++++
ambari-server/src/main/assemblies/server.xml | 4 ++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6663312/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index e7c3a54..bcf41ac 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1467,6 +1467,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6663312/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 76f1fe5..1f82b19 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -307,6 +307,10 @@
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>
<file>
+ <source>${project.build.directory}/CredentialUtil.jar</source>
+ <outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
+ </file>
+ <file>
<source>src/main/resources/APACHE-AMBARI-MIB.txt</source>
<outputDirectory>/var/lib/ambari-server/resources</outputDirectory>
</file>