Repository: spark Updated Branches: refs/heads/branch-1.5 9740d43d3 -> bfb4c8425
[SPARK-10059] [YARN] Explicitly add JSP dependencies for tests. Author: Marcelo Vanzin <[email protected]> Closes #8251 from vanzin/SPARK-10059. (cherry picked from commit ee093c8b927e8d488aeb76115c7fb0de96af7720) Signed-off-by: Marcelo Vanzin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bfb4c842 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bfb4c842 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bfb4c842 Branch: refs/heads/branch-1.5 Commit: bfb4c842540310fc3d369382ba7e341cd9a68940 Parents: 9740d43 Author: Marcelo Vanzin <[email protected]> Authored: Mon Aug 17 19:35:35 2015 -0700 Committer: Marcelo Vanzin <[email protected]> Committed: Mon Aug 17 19:35:50 2015 -0700 ---------------------------------------------------------------------- yarn/pom.xml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/bfb4c842/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/pom.xml b/yarn/pom.xml index 49360c4..15db54e 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -92,12 +92,28 @@ <artifactId>jetty-servlet</artifactId> </dependency> <!-- End of shaded deps. --> - + + <!-- + SPARK-10059: Explicitly add JSP dependencies for tests since the MiniYARN cluster needs them. + --> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp</artifactId> + <version>2.2.0.v201112011158</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet.jsp.jstl</artifactId> + <version>1.2.0.v201105211821</version> + <scope>test</scope> + </dependency> + <!-- See SPARK-3710. hadoop-yarn-server-tests in Hadoop 2.2 fails to pull some needed dependencies, so they need to be added manually for the tests to work. --> - + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-tests</artifactId> @@ -137,7 +153,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
