HDFS-2513. Bump jetty to 6.1.26. Contributed by Konstantin Boudnik

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1202503 13f79535-47bb-0310-9956-ffa450edef68

hdfs/CHANGES.txt

@@ -659,6 +659,8 @@ Release 0.22.0 - Unreleased
     HDFS-2002. Incorrect computation of needed blocks in getTurnOffTip().
     (Plamen Jeliazkov via shv)
 
+    HDFS-2513. Bump jetty to 6.1.26 (cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

hdfs/ivy/libraries.properties

@@ -44,8 +44,7 @@ ivy.version=2.1.0
 jasper.version=5.5.12
 jsp.version=2.1
 jsp-api.version=5.5.12
-jetty.version=6.1.14
-jetty-util.version=6.1.14
+jetty.version=6.1.26
 junit.version=4.8.1
 jdiff.version=1.0.9
 json.version=1.0
@@ -62,8 +61,6 @@ paranamer.version=2.3
 rats-lib.version=0.6
 
 servlet.version=4.0.6
-servlet-api-2.5.version=6.1.14
-servlet-api.version=2.5
 slf4j-api.version=1.5.11
 slf4j-log4j12.version=1.5.11
 

hdfs/src/contrib/hdfsproxy/ivy/libraries.properties

@@ -6,13 +6,11 @@ ivy.version=2.1.0
 log4j.version=1.2.15
 slf4j-api.version=1.5.11
 slf4j-log4j12.version=1.5.11
-jetty.version=6.1.14
-jetty-util.version=6.1.14
-servlet-api-2.5.version=6.1.14
+jetty.version=6.1.26
 cactus.version=1.8.0
 commons-logging.version=1.1.1
 commons-logging-api.version=1.1
 junit.version=4.8.1
 jsp.version=2.1
 core.version=3.1.1
-xmlenc.version=0.52
+xmlenc.version=0.52