Repository: spark Updated Branches: refs/heads/branch-1.3 49f2187a3 -> 1747e0a68
[SPARK-6070] [yarn] Remove unneeded classes from shuffle service jar. These may conflict with the classes already in the NM. We shouldn't be repackaging them. Author: Marcelo Vanzin <[email protected]> Closes #4820 from vanzin/SPARK-6070 and squashes the following commits: 871b566 [Marcelo Vanzin] The "d'oh how didn't I think of it before" solution. 3cba946 [Marcelo Vanzin] Use profile instead, so that dependencies don't need to be explicitly listed. 7a18a1b [Marcelo Vanzin] [SPARK-6070] [yarn] Remove unneeded classes from shuffle service jar. (cherry picked from commit dba08d1fc3bdb9245aefe695970354df088a93b6) 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/1747e0a6 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1747e0a6 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1747e0a6 Branch: refs/heads/branch-1.3 Commit: 1747e0a68f6e0222e0b0725a9ec7657e0b2beebf Parents: 49f2187 Author: Marcelo Vanzin <[email protected]> Authored: Fri Feb 27 22:44:11 2015 -0800 Committer: Patrick Wendell <[email protected]> Committed: Fri Feb 27 22:44:18 2015 -0800 ---------------------------------------------------------------------- network/yarn/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1747e0a6/network/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml index 4e98493..aecfe8d 100644 --- a/network/yarn/pom.xml +++ b/network/yarn/pom.xml @@ -33,6 +33,8 @@ <url>http://spark.apache.org/</url> <properties> <sbt.project.name>network-yarn</sbt.project.name> + <!-- Make sure all Hadoop dependencies are provided to avoid repackaging. --> + <hadoop.deps.scope>provided</hadoop.deps.scope> </properties> <dependencies> @@ -47,7 +49,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <scope>provided</scope> </dependency> </dependencies> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
