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

@@ -1,5 +1,19 @@
 Hadoop Change Log
 
+Release 2.6.6 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+    HADOOP-13812. Upgrade Tomcat to 6.0.48. (John Zhuge via aajisaka)
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
 Release 2.6.5 - 2016-10-08
 
   INCOMPATIBLE CHANGES

hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm

@@ -197,6 +197,9 @@ hadoop-${project.version} $ sbin/kms.sh start
   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.
+
 *** KMS Proxyuser Configuration
 
   Each proxyuser must be configured in <<<etc/hadoop/kms-site.xml>>> using the

hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/apt/ServerSetup.apt.vm

@@ -157,3 +157,6 @@ $ keytool -genkey -alias tomcat -keyalg RSA
   <<<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

@@ -75,7 +75,7 @@
 
     <zookeeper.version>3.4.6</zookeeper.version>
 
-    <tomcat.version>6.0.41</tomcat.version>
+    <tomcat.version>6.0.48</tomcat.version>
     <maven-remote-resources-plugin.version>1.5</maven-remote-resources-plugin.version>
   </properties>