Repository: spark Updated Branches: refs/heads/master f5041579f -> d940e4c16
SPARK-1693: Most of the tests throw a java.lang.SecurityException when s... ...park built for hadoop 2.3.0 , 2.4.0 Author: witgo <wi...@qq.com> Closes #628 from witgo/SPARK-1693_new and squashes the following commits: e3af968 [witgo] Merge branch 'master' of https://github.com/apache/spark into SPARK-1693_new dc63905 [witgo] SPARK-1693: Most of the tests throw a java.lang.SecurityException when spark built for hadoop 2.3.0 , 2.4.0 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d940e4c1 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d940e4c1 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d940e4c1 Branch: refs/heads/master Commit: d940e4c16aaa7b60daf1229a99bc4d3455c0240d Parents: f504157 Author: witgo <wi...@qq.com> Authored: Sun May 4 17:48:52 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Sun May 4 17:48:52 2014 -0700 ---------------------------------------------------------------------- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d940e4c1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7678043..08c3ac6 100644 --- a/pom.xml +++ b/pom.xml @@ -601,6 +601,10 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> </exclusions> </dependency> @@ -621,6 +625,10 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency>
