From a3952ea6cc6746357a5487edf0af9181920a1eb3 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Date: Thu, 4 Apr 2019 13:56:49 +0800
Subject: [PATCH] update servlet jar conflict

---
 escheduler-common/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml
index 719d46fc1a..e06b344c4f 100644
--- a/escheduler-common/pom.xml
+++ b/escheduler-common/pom.xml
@@ -348,6 +348,10 @@
 					<artifactId>javax.servlet</artifactId>
 					<groupId>org.eclipse.jetty.orbit</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>servlet-api-2.5</artifactId>
+					<groupId>org.mortbay.jetty</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>