diff options
| author | Bernardo Gomez Palacio <bernardo.gomezpalacio@gmail.com> | 2014-05-12 11:10:28 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-12 11:10:28 -0700 |
| commit | d9c97ba39723d36d3dcb53a75a3a2565357c0955 (patch) | |
| tree | 0569444960ad9d41d94582e53d3f216957dc3d75 /pom.xml | |
| parent | 3af1f386439cdddd42e545ad63d089f4dfdf9f8a (diff) | |
| download | spark-d9c97ba39723d36d3dcb53a75a3a2565357c0955.tar.gz spark-d9c97ba39723d36d3dcb53a75a3a2565357c0955.tar.bz2 spark-d9c97ba39723d36d3dcb53a75a3a2565357c0955.zip | |
SPARK-1806: Upgrade Mesos dependency to 0.18.1
Enabled Mesos (0.18.1) dependency with shaded protobuf
Why is this needed?
Avoids any protobuf version collision between Mesos and any other
dependency in Spark e.g. Hadoop HDFS 2.2+ or 1.0.4.
Ticket: https://issues.apache.org/jira/browse/SPARK-1806
* Should close https://issues.apache.org/jira/browse/SPARK-1433
Author berngp
Author: Bernardo Gomez Palacio <bernardo.gomezpalacio@gmail.com>
Closes #741 from berngp/feature/SPARK-1806 and squashes the following commits:
5d70646 [Bernardo Gomez Palacio] SPARK-1806: Upgrade Mesos dependency to 0.18.1
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -113,7 +113,8 @@ <scala.version>2.10.4</scala.version> <scala.binary.version>2.10</scala.binary.version> - <mesos.version>0.13.0</mesos.version> + <mesos.version>0.18.1</mesos.version> + <mesos.classifier>shaded-protobuf</mesos.classifier> <akka.group>org.spark-project.akka</akka.group> <akka.version>2.2.3-shaded-protobuf</akka.version> <slf4j.version>1.7.5</slf4j.version> @@ -349,6 +350,13 @@ <groupId>org.apache.mesos</groupId> <artifactId>mesos</artifactId> <version>${mesos.version}</version> + <classifier>${mesos.classifier}</classifier> + <exclusions> + <exclusion> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-net</groupId> |