Browse Source

HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu)

(cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78)
Alejandro Abdelnur 10 năm trước cách đây
mục cha
commit
09a0ad328f

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -143,6 +143,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11005. Fix HTTP content type for ReconfigurationServlet.
     (Lei Xu via wang)
 
+    HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest
+    6.x version. (rkanter via tucu)
+
   OPTIMIZATIONS
 
     HADOOP-10838. Byte array native checksumming. (James Thomas via todd)

+ 0 - 1
hadoop-common-project/hadoop-kms/pom.xml

@@ -34,7 +34,6 @@
   <description>Apache Hadoop KMS</description>
 
   <properties>
-    <tomcat.version>6.0.36</tomcat.version>
     <kms.tomcat.dist.dir>
       ${project.build.directory}/${project.artifactId}-${project.version}/share/hadoop/kms/tomcat
     </kms.tomcat.dist.dir>

+ 0 - 1
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml

@@ -34,7 +34,6 @@
   <description>Apache Hadoop HttpFS</description>
 
   <properties>
-    <tomcat.version>6.0.36</tomcat.version>
     <httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
     <httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
     <httpfs.source.revision>REVISION NOT AVAIL</httpfs.source.revision>

+ 2 - 0
hadoop-project/pom.xml

@@ -67,6 +67,8 @@
     <protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
 
     <zookeeper.version>3.4.6</zookeeper.version>
+
+    <tomcat.version>6.0.41</tomcat.version>
   </properties>
 
   <dependencyManagement>