ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smn...@apache.org
Subject ambari git commit: AMBARI-19865: Ambari-server logon failure: Hadoop-common dependency on servlet-api 2.5
Date Fri, 03 Feb 2017 19:48:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ecfc951b5 -> 4d8006502


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/4d800650
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d800650
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d800650

Branch: refs/heads/trunk
Commit: 4d800650279f65d1deb6f754f11235008f19ce47
Parents: ecfc951
Author: Nahappan Somasundaram <nsomasundaram@hortonworks.com>
Authored: Fri Feb 3 07:57:28 2017 -0800
Committer: Nahappan Somasundaram <nsomasundaram@hortonworks.com>
Committed: Fri Feb 3 11:35:45 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/4d800650/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 89b734e..0508556 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1481,6 +1481,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/4d800650/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 d65232c..1902384 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>


Mime
View raw message