aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorAndrew Or <andrew@databricks.com>2014-11-12 00:04:30 -0800
committerAndrew Or <andrew@databricks.com>2014-11-12 00:04:30 -0800
commit45a01b6cdea8c82d20691fc715959e16ebbb0b17 (patch)
tree5bf4efef35e50e9d852dfd0feee69b27ad5975a1 /pom.xml
parent5c0032a471d858fb010b1737ea14375f1af3ed88 (diff)
downloadspark-45a01b6cdea8c82d20691fc715959e16ebbb0b17.tar.gz
spark-45a01b6cdea8c82d20691fc715959e16ebbb0b17.tar.bz2
spark-45a01b6cdea8c82d20691fc715959e16ebbb0b17.zip
Revert "SPARK-3039: Allow spark to be built using avro-mapred for hadoop2"
This reverts commit 78887f94a0ae9cdcfb851910ab9c7d51a1ef2acb. Conflicts: pom.xml
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml5
1 files changed, 0 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 3f6932fca0..d185ccccf3 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>