Commit 2d0084ff authored by baoliang's avatar baoliang
Browse files

Merge remote-tracking branch 'upstream/branch-1.0.2' into 102

parents a0b0bae1 4e51d0d9
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -352,6 +352,10 @@
					<artifactId>servlet-api-2.5</artifactId>
					<groupId>org.mortbay.jetty</groupId>
				</exclusion>
				<exclusion>
					<artifactId>jasper-runtime</artifactId>
					<groupId>tomcat</groupId>
				</exclusion>
			</exclusions>
		</dependency>