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-common/CHANGES.txt

@@ -4,6 +4,8 @@ Release 2.7.4 - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
+    HADOOP-13812. Upgrade Tomcat to 6.0.48. (John Zhuge via aajisaka)
+
   NEW FEATURES
 
   IMPROVEMENTS

hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm

@@ -216,7 +216,7 @@ 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.
 
-$H4 KMS Access Control
+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.
 
 KMS ACLs configuration are defined in the KMS `etc/hadoop/kms-acls.xml` configuration file. This file is hot-reloaded when it changes.
 

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.

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>
 
     <!-- define the Java language version used by the compiler -->
     <javac.version>1.7</javac.version>