Repository: spark Updated Branches: refs/heads/branch-1.3 3fc74f45a -> a0aa24a63
[SPARK-6149] [SQL] [Build] Excludes Guava 15 referenced by jackson-module-scala_2.10 This PR excludes Guava 15.0 from the SBT build, to make Spark SQL CLI (`bin/spark-sql`) work when compiled against Hive 0.12.0. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png"; height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/apache/spark/4890) <!-- Reviewable:end --> Author: Cheng Lian <l...@databricks.com> Closes #4890 from liancheng/exclude-guava-15 and squashes the following commits: 91ae9fa [Cheng Lian] Moves Guava 15 exclusion from SBT build to POM 282bd2a [Cheng Lian] Excludes Guava 15 referenced by jackson-module-scala_2.10 (cherry picked from commit 1aa90e39e33caa497971544ee7643fb3ff048c12) Signed-off-by: Patrick Wendell <patr...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a0aa24a6 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a0aa24a6 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a0aa24a6 Branch: refs/heads/branch-1.3 Commit: a0aa24a63e8549c36a938248305734ff6cfa6cc6 Parents: 3fc74f4 Author: Cheng Lian <l...@databricks.com> Authored: Wed Mar 4 20:52:58 2015 -0800 Committer: Patrick Wendell <patr...@databricks.com> Committed: Wed Mar 4 20:53:17 2015 -0800 ---------------------------------------------------------------------- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a0aa24a6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ce1e544..c984eee 100644 --- a/pom.xml +++ b/pom.xml @@ -583,10 +583,18 @@ <artifactId>jackson-databind</artifactId> <version>${fasterxml.jackson.version}</version> </dependency> + <!-- Guava is excluded because of SPARK-6149. The Guava version referenced in this module is + 15.0, which causes runtime incompatibility issues. --> <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-scala_2.10</artifactId> <version>${fasterxml.jackson.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.scala-lang</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
![https://reviewable.io/review_button.png"](https://reviewable.io/review_button.png"){kind=link}