You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/11/12 09:05:23 UTC
spark git commit: Revert "SPARK-3039: Allow spark to be built using
avro-mapred for hadoop2"
Repository: spark
Updated Branches:
refs/heads/branch-1.1 5c0032a47 -> 45a01b6cd
Revert "SPARK-3039: Allow spark to be built using avro-mapred for hadoop2"
This reverts commit 78887f94a0ae9cdcfb851910ab9c7d51a1ef2acb.
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/45a01b6c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/45a01b6c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/45a01b6c
Branch: refs/heads/branch-1.1
Commit: 45a01b6cdea8c82d20691fc715959e16ebbb0b17
Parents: 5c0032a
Author: Andrew Or <an...@databricks.com>
Authored: Wed Nov 12 00:04:30 2014 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Wed Nov 12 00:04:30 2014 -0800
----------------------------------------------------------------------
pom.xml | 5 -----
sql/hive/pom.xml | 9 ---------
2 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/45a01b6c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f6932f..d185ccc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,6 @@
<chill.version>0.3.6</chill.version>
<codahale.metrics.version>3.0.0</codahale.metrics.version>
<avro.version>1.7.6</avro.version>
- <avro.mapred.classifier />
<jets3t.version>0.7.1</jets3t.version>
<aws.java.sdk.version>1.8.3</aws.java.sdk.version>
<aws.kinesis.client.version>1.1.0</aws.kinesis.client.version>
@@ -609,7 +608,6 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
<version>${avro.version}</version>
- <classifier>${avro.mapred.classifier}</classifier>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -1083,7 +1081,6 @@
<properties>
<hadoop.version>2.2.0</hadoop.version>
<protobuf.version>2.5.0</protobuf.version>
- <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
</properties>
</profile>
@@ -1093,7 +1090,6 @@
<hadoop.version>2.3.0</hadoop.version>
<protobuf.version>2.5.0</protobuf.version>
<jets3t.version>0.9.0</jets3t.version>
- <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
</properties>
</profile>
@@ -1103,7 +1099,6 @@
<hadoop.version>2.4.0</hadoop.version>
<protobuf.version>2.5.0</protobuf.version>
<jets3t.version>0.9.0</jets3t.version>
- <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
</properties>
</profile>
http://git-wip-us.apache.org/repos/asf/spark/blob/45a01b6c/sql/hive/pom.xml
----------------------------------------------------------------------
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index ecd9419..241e305 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -94,15 +94,6 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>${avro.version}</version>
- </dependency>
- <!-- use the build matching the hadoop api of avro-mapred (i.e. no classifier for hadoop 1 API,
- hadoop2 classifier for hadoop 2 API. avro-mapred is a dependency of org.spark-project.hive:hive-serde -->
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-mapred</artifactId>
- <version>${avro.version}</version>
- <classifier>${avro.mapred.classifier}</classifier>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org