Repository: spark Updated Branches: refs/heads/branch-1.0 4505bc28e -> ec0bce10d
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 <[email protected]> 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 (cherry picked from commit d940e4c16aaa7b60daf1229a99bc4d3455c0240d) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ec0bce10 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ec0bce10 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ec0bce10 Branch: refs/heads/branch-1.0 Commit: ec0bce10de180b8276a9344b1217cfda271bbdcf Parents: 4505bc2 Author: witgo <[email protected]> Authored: Sun May 4 17:48:52 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sun May 4 17:49:00 2014 -0700 ---------------------------------------------------------------------- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ec0bce10/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 41b98ed..930c2fb 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>
