diff options
| author | Ahir Reddy <ahirreddy@gmail.com> | 2014-04-22 09:44:41 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-22 09:45:33 -0700 |
| commit | 798d93f3016476491591bcbcc6b259b76f261857 (patch) | |
| tree | 8b2b6b380e193b57b2555033c71fe4e4eee9ca41 | |
| parent | 72aa131cb344a508a91f94183bc6b077e5f3a4b7 (diff) | |
| download | spark-798d93f3016476491591bcbcc6b259b76f261857.tar.gz spark-798d93f3016476491591bcbcc6b259b76f261857.tar.bz2 spark-798d93f3016476491591bcbcc6b259b76f261857.zip | |
[SPARK-1560]: Updated Pyrolite Dependency to be Java 6 compatible
Changed the Pyrolite dependency to a build which targets Java 6.
Author: Ahir Reddy <ahirreddy@gmail.com>
Closes #479 from ahirreddy/java6-pyrolite and squashes the following commits:
8ea25d3 [Ahir Reddy] Updated maven build to use java 6 compatible pyrolite
dabc703 [Ahir Reddy] Updated Pyrolite dependency to be Java 6 compatible
(cherry picked from commit 0f87e6ad4366a8c453a7415bc89399030003c264)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
| -rw-r--r-- | core/pom.xml | 2 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pom.xml b/core/pom.xml index d87e2bca03..058b7acba7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -269,7 +269,7 @@ <dependency> <groupId>org.spark-project</groupId> <artifactId>pyrolite</artifactId> - <version>2.0</version> + <version>2.0.1</version> </dependency> </dependencies> <build> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 6ab71fce0e..25f8cc79c8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -352,7 +352,7 @@ object SparkBuild extends Build { "com.twitter" % "chill-java" % chillVersion excludeAll(excludeAsm), "org.tachyonproject" % "tachyon" % "0.4.1-thrift" excludeAll(excludeHadoop, excludeCurator, excludeEclipseJetty, excludePowermock), "com.clearspring.analytics" % "stream" % "2.5.1" excludeAll(excludeFastutil), - "org.spark-project" % "pyrolite" % "2.0" + "org.spark-project" % "pyrolite" % "2.0.1" ), libraryDependencies ++= maybeAvro ) |