From 2cc8653ab304fbe3ff77e70ca0f141235db021a5 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Fri, 3 Feb 2017 11:32:40 -0800
Subject: [PATCH 1/6] [SPARK-19409][BUILD] Fix ParquetAvroCompatibilitySuite
 failure due to test dependency on avro.

---
 sql/core/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index b8aa69809098..f9acf815e367 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -129,6 +129,12 @@
       <artifactId>parquet-avro</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.8.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

From 499f6fdc568414d66156d72b5a411833fd116bea Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Mon, 6 Feb 2017 10:49:34 -0800
Subject: [PATCH 2/6] Move to parent pom.

---
 pom.xml          | 7 +++++++
 sql/core/pom.xml | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3679b4e26361..a2252f673e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,7 @@
     <oro.version>2.0.8</oro.version>
     <codahale.metrics.version>3.1.2</codahale.metrics.version>
     <avro.version>1.7.7</avro.version>
+    <avro.parquet.version>1.8.0</avro.parquet.version>
     <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
     <jets3t.version>0.7.1</jets3t.version>
     <aws.kinesis.client.version>1.6.2</aws.kinesis.client.version>
@@ -869,6 +870,12 @@
         <version>${avro.version}</version>
         <scope>${hadoop.deps.scope}</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro</artifactId>
+        <version>${avro.parquet.version}</version>
+        <scope>${parquet.test.deps.scope}</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-ipc</artifactId>
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index f9acf815e367..b8aa69809098 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -129,12 +129,6 @@
       <artifactId>parquet-avro</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.avro</groupId>
-      <artifactId>avro</artifactId>
-      <version>1.8.0</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

From 42ff6426ec090ef6a1242d8556f39cbdef526d8b Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Mon, 6 Feb 2017 11:32:16 -0800
Subject: [PATCH 3/6] Revert "Move to parent pom."

This reverts commit 499f6fdc568414d66156d72b5a411833fd116bea.
---
 pom.xml          | 7 -------
 sql/core/pom.xml | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a2252f673e1a..3679b4e26361 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,6 @@
     <oro.version>2.0.8</oro.version>
     <codahale.metrics.version>3.1.2</codahale.metrics.version>
     <avro.version>1.7.7</avro.version>
-    <avro.parquet.version>1.8.0</avro.parquet.version>
     <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
     <jets3t.version>0.7.1</jets3t.version>
     <aws.kinesis.client.version>1.6.2</aws.kinesis.client.version>
@@ -870,12 +869,6 @@
         <version>${avro.version}</version>
         <scope>${hadoop.deps.scope}</scope>
       </dependency>
-      <dependency>
-        <groupId>org.apache.avro</groupId>
-        <artifactId>avro</artifactId>
-        <version>${avro.parquet.version}</version>
-        <scope>${parquet.test.deps.scope}</scope>
-      </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-ipc</artifactId>
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index b8aa69809098..f9acf815e367 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -129,6 +129,12 @@
       <artifactId>parquet-avro</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.8.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

From 941bf00e7a41c7e64c99c9499acfd5deafc04f39 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Mon, 6 Feb 2017 14:36:32 -0800
Subject: [PATCH 4/6] Add spark-tags into mesos module.

---
 resource-managers/mesos/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml
index c0a8f9a344ab..03846d9f5a3b 100644
--- a/resource-managers/mesos/pom.xml
+++ b/resource-managers/mesos/pom.xml
@@ -48,6 +48,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-tags_${scala.binary.version}</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.mesos</groupId>
       <artifactId>mesos</artifactId>

From 47e90339e0693c04240bdb37d92a19517cee52ec Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 7 Feb 2017 13:33:45 -0800
Subject: [PATCH 5/6] Use 1.8.1 instead of 1.8.0.

---
 sql/core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index f9acf815e367..ca4d95fb3e13 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -132,7 +132,7 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.8.0</version>
+      <version>1.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From b9e336f896f35e46342f65fcf619d740167cd4e5 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 7 Feb 2017 14:16:39 -0800
Subject: [PATCH 6/6] Add comments.

---
 sql/core/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index ca4d95fb3e13..69d797b47915 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -129,6 +129,13 @@
       <artifactId>parquet-avro</artifactId>
       <scope>test</scope>
     </dependency>
+    <!--
+      This version of avro test-dep is different from the one defined
+      in the parent pom. The parent pom has avro 1.7.7 test-dep for Hadoop.
+      Here, ParquetAvroCompatibilitySuite uses parquet-avro's AvroParquetWriter
+      which uses avro 1.8.0+ specific API. In Maven 3, we need to have
+      this here to have different versions for the same artifact.
+    -->
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>