From 8d8683c89202634bbf8790161537ce6de4392a9c Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Wed, 2 Sep 2015 11:36:47 -0700
Subject: [PATCH 1/2] [SPARK-10421] [build] Exclude curator-framework from
 tachyon dependency.

This avoids it being mistakenly pulled instead of the newer one that
Spark actually uses. Spark only depends on curator-framework transitively,
so sometimes maven just decides to pick tachyon's version of that
dependency for whatever reason.
---
 core/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 4f79d71bf85fa..3cb84c3aebb63 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -272,6 +272,10 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-client</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-framework</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.curator</groupId>
           <artifactId>curator-recipes</artifactId>

From a320d1b8835b88401d52ec3235b3d1f85b45e989 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Wed, 2 Sep 2015 11:51:45 -0700
Subject: [PATCH 2/2] Also need to exclude curator-client.

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

diff --git a/core/pom.xml b/core/pom.xml
index 3cb84c3aebb63..a46292c13bcc0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -272,6 +272,10 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-client</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.curator</groupId>
+          <artifactId>curator-client</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.curator</groupId>
           <artifactId>curator-framework</artifactId>