You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/02/08 11:35:35 UTC
spark git commit: [SPARK-3039] [BUILD] Spark assembly for new hadoop
API (hadoop 2) contai...
Repository: spark
Updated Branches:
refs/heads/master 23a99dabf -> 75fdccca3
[SPARK-3039] [BUILD] Spark assembly for new hadoop API (hadoop 2) contai...
...ns avro-mapred for
hadoop 1 API had been marked as resolved but did not work for at least some
builds due to version conflicts using avro-mapred-1.7.5.jar and
avro-mapred-1.7.6-hadoop2.jar (the correct version) when building for hadoop2.
sql/hive/pom.xml org.spark-project.hive:hive-exec's depends on 1.7.5:
Building Spark Project Hive 1.2.0
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-dependency-plugin:2.4:tree (default-cli) spark-hive_2.10 ---
[INFO] org.apache.spark:spark-hive_2.10:jar:1.2.0
[INFO] +- org.spark-project.hive:hive-exec:jar:0.13.1a:compile
[INFO] | \- org.apache.avro:avro-mapred:jar:1.7.5:compile
[INFO] \- org.apache.avro:avro-mapred:jar:hadoop2:1.7.6:compile
[INFO]
Excluding this dependency allows the explicitly listed avro-mapred dependency
to be picked up.
Author: medale <me...@yahoo.com>
Closes #4315 from medale/avro-hadoop2 and squashes the following commits:
1ab4fa3 [medale] Merge branch 'master' into avro-hadoop2
9d85e2a [medale] Merge remote-tracking branch 'upstream/master' into avro-hadoop2
51b9c2a [medale] [SPARK-3039] [BUILD] Spark assembly for new hadoop API (hadoop 2) contains avro-mapred for hadoop 1 API had been marked as resolved but did not work for at least some builds due to version conflicts using avro-mapred-1.7.5.jar and avro-mapred-1.7.6-hadoop2.jar (the correct version) when building for hadoop2.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/75fdccca
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/75fdccca
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/75fdccca
Branch: refs/heads/master
Commit: 75fdccca32972f86a975033d7c4ce576dd79290f
Parents: 23a99da
Author: medale <me...@yahoo.com>
Authored: Sun Feb 8 10:35:29 2015 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Sun Feb 8 10:35:29 2015 +0000
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/75fdccca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e0c796b..f6f176d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -975,6 +975,10 @@
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org