From 20d4c0114c5fd06f38be4e806bde27cce86f4150 Mon Sep 17 00:00:00 2001
From: qiumingming <qiumingming@bytedance.com>
Date: Fri, 30 Jun 2017 16:17:56 +0800
Subject: [PATCH] KYLIN-2699 Tomcat LinkageError for curator-client jar file
 conflict

---
 kylin.patch | 0
 pom.xml     | 6 ++++++
 2 files changed, 6 insertions(+)
 create mode 100644 kylin.patch

diff --git a/kylin.patch b/kylin.patch
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index 506d734..f765f00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -419,6 +419,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.curator</groupId>
+                <artifactId>curator-client</artifactId>
+                <version>${curator.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
                 <artifactId>curator-framework</artifactId>
                 <version>${curator.version}</version>
                 <scope>provided</scope>
-- 
2.10.1