Merge pull request #110 from pwendell/master
Exclude jopt from kafka dependency. Kafka uses an older version of jopt that causes bad conflicts with the version used by spark-perf. It's not easy to remove this downstream because of the way that spark-perf uses Spark (by including a spark assembly as an unmanaged jar). This fixes the problem at its source by just never including it.
This commit is contained in:
commit
ab35ec4f0f
|
@ -292,6 +292,7 @@ object SparkBuild extends Build {
|
||||||
"org.apache.kafka" % "kafka_2.9.2" % "0.8.0-beta1"
|
"org.apache.kafka" % "kafka_2.9.2" % "0.8.0-beta1"
|
||||||
exclude("com.sun.jdmk", "jmxtools")
|
exclude("com.sun.jdmk", "jmxtools")
|
||||||
exclude("com.sun.jmx", "jmxri")
|
exclude("com.sun.jmx", "jmxri")
|
||||||
|
exclude("net.sf.jopt-simple", "jopt-simple")
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -73,6 +73,10 @@
|
||||||
<groupId>com.sun.jdmk</groupId>
|
<groupId>com.sun.jdmk</groupId>
|
||||||
<artifactId>jmxtools</artifactId>
|
<artifactId>jmxtools</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>net.sf.jopt-simple</groupId>
|
||||||
|
<artifactId>jopt-simple</artifactId>
|
||||||
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
Loading…
Reference in a new issue