From 24740522e379a4a5e11774667046a791e2650135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=AB=A0=E7=AB=A0?= <2565307098@qq.com>
Date: Wed, 25 Sep 2019 15:21:54 +0800
Subject: [PATCH] Update pom.xml (#876)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[BUG][#860] jar包冲突Correct the classpath of your application so that it contains a single, compatible version of javax.servlet.ServletContext
---
 escheduler-common/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml
index b5f1d58620..fe24d02209 100644
--- a/escheduler-common/pom.xml
+++ b/escheduler-common/pom.xml
@@ -572,6 +572,12 @@
 		<dependency>
 			<groupId>org.mortbay.jetty</groupId>
 			<artifactId>jsp-2.1</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>servlet-api-2.5</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>