浏览代码

HADOOP-13812. Upgrade Tomcat to 6.0.48. Contributed by John Zhuge.

Akira Ajisaka 8 年之前
父节点
当前提交
00096dcc0c

+ 2 - 0
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: 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)
 $H4 ACLs (Access Control Lists)
 
 
 KMS supports ACLs (Access Control Lists) for fine-grained permission control.
 KMS supports ACLs (Access Control Lists) for fine-grained permission control.

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm

@@ -119,3 +119,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.
 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.
 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.

+ 1 - 1
hadoop-project/pom.xml

@@ -85,7 +85,7 @@
     <curator.version>2.7.1</curator.version>
     <curator.version>2.7.1</curator.version>
     <findbugs.version>3.0.0</findbugs.version>
     <findbugs.version>3.0.0</findbugs.version>
 
 
-    <tomcat.version>6.0.44</tomcat.version>
+    <tomcat.version>6.0.48</tomcat.version>
     <guice.version>4.0</guice.version>
     <guice.version>4.0</guice.version>
     <joda-time.version>2.9.4</joda-time.version>
     <joda-time.version>2.9.4</joda-time.version>