From 45a01b6cdea8c82d20691fc715959e16ebbb0b17 Mon Sep 17 00:00:00 2001
From: Andrew Or <andrew@databricks.com>
Date: Wed, 12 Nov 2014 00:04:30 -0800
Subject: Revert "SPARK-3039: Allow spark to be built using avro-mapred for
 hadoop2"

This reverts commit 78887f94a0ae9cdcfb851910ab9c7d51a1ef2acb.

Conflicts:
	pom.xml
---
 sql/hive/pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'sql/hive/pom.xml')

diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index ecd9419250..241e305cad 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>
-- 
cgit v1.2.3