From 129beeeddd7ac1209c3630cd0b6e44b93bd58673 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 29 Nov 2016 19:47:02 +0900
Subject: [PATCH] HADOOP-13812. Upgrade Tomcat to 6.0.48. Contributed by John
 Zhuge.

(cherry picked from commit 00096dcc0c23af38e697cd7c6c29e3f00d744e54)
(cherry picked from commit 0c895e8a62b4b69a020a5f004e97323520a1b1d0)
---
 hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm  | 2 ++
 .../hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm      | 2 ++
 hadoop-project/pom.xml                                          | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
index 1aa53eb1bef..1cd8af7d938 100644
--- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
+++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
@@ -298,6 +298,8 @@ The answer to "What is your first and last name?" (i.e. "CN") must be the hostna
 
 NOTE: You need to restart the KMS for the configuration changes to take effect.
 
+NOTE: Some old SSL clients may use weak ciphers that are not supported by the KMS server. It is recommended to upgrade the SSL client.
+
 $H4 ACLs (Access Control Lists)
 
 KMS supports ACLs (Access Control Lists) for fine-grained permission control.
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
index eb0a8c96594..ffc8f50552d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
@@ -115,3 +115,5 @@ The answer to "What is your first and last name?" (i.e. "CN") must be the hostna
 Start HttpFS. It should work over HTTPS.
 
 Using the Hadoop `FileSystem` API or the Hadoop FS shell, use the `swebhdfs://` scheme. Make sure the JVM is picking up the truststore containing the public key of the SSL certificate if using a self-signed certificate.
+
+NOTE: Some old SSL clients may use weak ciphers that are not supported by the HttpFS server. It is recommended to upgrade the SSL client.
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ac05dadf211..ec45ec8d115 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -79,7 +79,7 @@
     <curator.version>2.7.1</curator.version>
     <findbugs.version>3.0.0</findbugs.version>
 
-    <tomcat.version>6.0.44</tomcat.version>
+    <tomcat.version>6.0.48</tomcat.version>
     <joda-time.version>2.9.4</joda-time.version>
 
     <!-- Required for testing LDAP integration -->