You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/10/25 19:16:22 UTC
[1/2] git commit: Exclude jopt from kafka dependency.
Updated Branches:
refs/heads/master 4f2c9438b -> ab35ec4f0
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/af4a529f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/af4a529f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/af4a529f
Branch: refs/heads/master
Commit: af4a529f6efae7d0f7e5915f0221f31ea755a374
Parents: ad5f579
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Oct 25 09:18:36 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Oct 25 09:20:30 2013 -0700
----------------------------------------------------------------------
project/SparkBuild.scala | 1 +
streaming/pom.xml | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/af4a529f/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 8d7cbae..45fd30a 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -292,6 +292,7 @@ object SparkBuild extends Build {
"org.apache.kafka" % "kafka_2.9.2" % "0.8.0-beta1"
exclude("com.sun.jdmk", "jmxtools")
exclude("com.sun.jmx", "jmxri")
+ exclude("net.sf.jopt-simple", "jopt-simple")
)
)
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/af4a529f/streaming/pom.xml
----------------------------------------------------------------------
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 8022c4f..7a9ae6a 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -73,6 +73,10 @@
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[2/2] git commit: Merge pull request #110 from pwendell/master
Posted by rx...@apache.org.
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/ab35ec4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/ab35ec4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/ab35ec4f
Branch: refs/heads/master
Commit: ab35ec4f0f6c6892ad6457e58b1d95c9224ab5b8
Parents: 4f2c943 af4a529
Author: Reynold Xin <rx...@apache.org>
Authored: Fri Oct 25 10:16:18 2013 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Fri Oct 25 10:16:18 2013 -0700
----------------------------------------------------------------------
project/SparkBuild.scala | 1 +
streaming/pom.xml | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------