MAPREDUCE-3311. Bump jetty to 6.1.26. Controbuted by Konstantin Boudnik

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

mapreduce/CHANGES.txt

@@ -636,6 +636,8 @@ Release 0.22.0 - Unreleased
     enhanced UI for queue information.
     (Krishna Ramachandran and Milind Bhandarkar via shv) 
 
+    MAPREDUCE-3311. Bump jetty to 6.1.26 (cos)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

mapreduce/ivy/libraries.properties

@@ -52,8 +52,7 @@ jasper.version=5.5.12
 jsp.version=2.1
 jsp-api.version=5.5.12
 jets3t.version=0.7.1
-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
 
@@ -71,8 +70,6 @@ oro.version=2.0.8
 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
 

mapreduce/src/contrib/capacity-scheduler/ivy.xml

@@ -65,12 +65,6 @@
                 rev="${jetty-util.version}" conf="common->master"/>
     <dependency org="org.mortbay.jetty" name="jetty"
                 rev="${jetty.version}" conf="common->master"/>
-    <dependency org="org.mortbay.jetty" name="jsp-api-2.1" 
-                rev="${jetty.version}" conf="common->master"/>
-    <dependency org="org.mortbay.jetty" name="jsp-2.1" 
-	        rev="${jetty.version}" conf="common->master"/>
-    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" 
-                rev="${servlet-api-2.5.version}" conf="common->master"/>
     <dependency org="commons-httpclient" name="commons-httpclient" 
                 rev="${commons-httpclient.version}" conf="common->master"/>
   </dependencies>

mapreduce/src/contrib/dynamic-scheduler/ivy.xml

@@ -47,7 +47,6 @@
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="net.java.dev.jets3t" name="jets3t" rev="${jets3t.version}" conf="common->master"/>
     <dependency org="commons-net" name="commons-net" rev="${commons-net.version}" conf="common->master"/>  
-    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${servlet-api-2.5.version}" conf="common->master"/>
     <dependency org="junit" name="junit" rev="${junit.version}" conf="common->default"/>
     <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="common->master"/>
   </dependencies>

mapreduce/src/contrib/fairscheduler/ivy.xml

@@ -52,14 +52,14 @@
       name="commons-logging"
       rev="${commons-logging.version}"
       conf="common->default"/>
+    <dependency org="commons-lang"
+      name="commons-lang"
+      rev="${commons-lang.version}"
+      conf="common->default"/>
     <dependency org="log4j"
       name="log4j"
       rev="${log4j.version}"
       conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="servlet-api-2.5"
-      rev="${servlet-api-2.5.version}"
-      conf="common->default"/> 
    <dependency org="junit"
       name="junit"
       rev="${junit.version}"
@@ -76,13 +76,5 @@
       name="jetty"
       rev="${jetty.version}"
       conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-api-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
   </dependencies>
 </ivy-module>

mapreduce/src/contrib/gridmix/ivy.xml

@@ -94,18 +94,6 @@
       name="jetty-util"
       rev="${jetty-util.version}"
       conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-api-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="servlet-api-2.5"
-      rev="${servlet-api-2.5.version}"
-      conf="common->master"/>
     <dependency org="commons-cli"
       name="commons-cli"
       rev="${commons-cli.version}"

mapreduce/src/contrib/mumak/ivy.xml

@@ -51,6 +51,10 @@
       name="commons-logging"
       rev="${commons-logging.version}"
       conf="common->default"/>
+    <dependency org="commons-lang"
+      name="commons-lang"
+      rev="${commons-lang.version}"
+      conf="common->default"/>
     <dependency org="log4j"
       name="log4j"
       rev="${log4j.version}"
@@ -106,18 +110,6 @@
       name="jetty-util"
       rev="${jetty-util.version}"
       conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-api-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="servlet-api-2.5"
-      rev="${servlet-api-2.5.version}"
-      conf="common->master"/>
     <dependency org="commons-cli"
       name="commons-cli"
       rev="${commons-cli.version}"

mapreduce/src/contrib/raid/ivy.xml

@@ -56,6 +56,10 @@
       name="commons-logging"
       rev="${commons-logging.version}"
       conf="common->default"/>
+    <dependency org="commons-lang"
+      name="commons-lang"
+      rev="${commons-lang.version}"
+      conf="common->default"/>
     <dependency org="log4j"
       name="log4j"
       rev="${log4j.version}"
@@ -94,18 +98,6 @@
       name="jetty-util"
       rev="${jetty-util.version}"
       conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-api-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="jsp-2.1"
-      rev="${jetty.version}"
-      conf="common->master"/>
-    <dependency org="org.mortbay.jetty"
-      name="servlet-api-2.5"
-      rev="${servlet-api-2.5.version}"
-      conf="common->master"/>
     <dependency org="commons-cli"
       name="commons-cli"
       rev="${commons-cli.version}"

mapreduce/src/contrib/streaming/ivy.xml

@@ -52,18 +52,14 @@
                 rev="${commons-cli.version}" conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" 
                 rev="${commons-logging.version}" conf="common->default"/>
+    <dependency org="commons-lang" name="commons-lang"
+                rev="${commons-lang.version}" conf="common->default"/>
     <dependency org="junit" name="junit" 
                 rev="${junit.version}" conf="common->default"/>
     <dependency org="org.mortbay.jetty" name="jetty-util"
                 rev="${jetty-util.version}" conf="common->master"/>
     <dependency org="org.mortbay.jetty" name="jetty" 
                 rev="${jetty.version}" conf="common->master"/>
-    <dependency org="org.mortbay.jetty" name="jsp-api-2.1" 
-                rev="${jetty.version}" conf="common->master"/>
-    <dependency org="org.mortbay.jetty" name="jsp-2.1" 
-                rev="${jetty.version}" conf="common->master"/>
-    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" 
-                rev="${servlet-api-2.5.version}" conf="common->master"/>
     <dependency org="commons-httpclient" name="commons-httpclient" 
                 rev="${commons-httpclient.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j"