Commit a3952ea6 authored by qiaozhanwei's avatar qiaozhanwei
Browse files

update servlet jar conflict

parent 813c0c65
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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>