http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d50ccc5c/core/src/test/scala/org/apache/spark/rdd/RDDSuite.scala ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d50ccc5c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 3349583,57e8435..8c87e43 --- a/pom.xml +++ b/pom.xml @@@ -231,15 -200,15 +200,20 @@@ <artifactId>asm</artifactId> <version>4.0</version> </dependency> + <!-- In theory we need not directly depend on protobuf since Spark does not directly + use it. However, when building with Hadoop/YARN 2.2 Maven doesn't correctly bump + the protobuf version up from the one Mesos gives. For now we include this variable + to explicitly bump the version when building with YARN. It would be nice to figure + out why Maven can't resolve this correctly (like SBT does). --> <dependency> + <groupId>com.clearspring.analytics</groupId> + <artifactId>stream</artifactId> + <version>2.4.0</version> + </dependency> + <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.4.1</version> + <version>${protobuf.version}</version> </dependency> <dependency> <groupId>com.twitter</groupId>
