From 7624ebdcc227e3469cac30e2c20457434736078c Mon Sep 17 00:00:00 2001
From: KaiXinXiaoLei <huleilei1@huawei.com>
Date: Wed, 29 Oct 2014 10:16:26 +0800
Subject: [PATCH 1/2] change pom.xml

delete jetty 6.1.26
---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index abcb97108c5d9..fccf218640960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,6 +604,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -786,6 +790,10 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -813,6 +821,10 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>

From dff8f456a02a17fcc8bb9c56c1cc1fd521ad6f20 Mon Sep 17 00:00:00 2001
From: KaiXinXiaoLei <huleilei1@huawei.com>
Date: Wed, 29 Oct 2014 10:18:15 +0800
Subject: [PATCH 2/2] change pom.xml

when packaging, delete org/mortbay/**
---
 assembly/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 11d4bea9361ab..6792e22321022 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -119,6 +119,7 @@
               <artifact>*:*</artifact>
               <excludes>
                 <exclude>org/datanucleus/**</exclude>
+                <exclude>org/mortbay/**</exclude>
                 <exclude>META-INF/*.SF</exclude>
                 <exclude>META-INF/*.DSA</exclude>
                 <exclude>META-INF/*.RSA</exclude>