From 447dfc0cc6325d4a4efa2ca9f9330a778b8b212e Mon Sep 17 00:00:00 2001
From: Marshall Pierce <marshall@palominolabs.com>
Date: Fri, 9 Nov 2012 17:31:03 -0800
Subject: [PATCH] Switch to using javax.servlet:servlet-api:2.5 instead of two
 different versions of jetty's servlet-api distribution

---
 client/pom.xml  |  2 +-
 indexer/pom.xml |  6 ++++++
 pom.xml         | 10 ++++++++--
 server/pom.xml  |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 3ea63f6762a..9e2e137eeaf 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -159,7 +159,7 @@
             <version>3.2.4.Final</version>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
         </dependency>
         <dependency>
diff --git a/indexer/pom.xml b/indexer/pom.xml
index ded2d47bd90..dfaadab3aa9 100644
--- a/indexer/pom.xml
+++ b/indexer/pom.xml
@@ -71,6 +71,12 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-core</artifactId>
             <version>0.20.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api-2.5</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
diff --git a/pom.xml b/pom.xml
index 30edcad2f15..4762d260dc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,12 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty</artifactId>
                 <version>6.1.26</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>servlet-api</artifactId>
+                        </exclusion>
+                    </exclusions>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
@@ -237,9 +243,9 @@
                 <version>1.2.16</version>
             </dependency>
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
-                <version>2.5-20081211</version>
+                <version>2.5</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
diff --git a/server/pom.xml b/server/pom.xml
index e692b005490..100a3785b18 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -163,7 +163,7 @@
             <artifactId>log4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
         </dependency>
         <dependency>