From 51116833771709f1492e477adf2da6aa82551808 Mon Sep 17 00:00:00 2001
From: "leon.li" <leon.li@dianping.com>
Date: Thu, 1 Sep 2016 11:52:50 +0800
Subject: [PATCH] remove conflict dependency

---
 camel-admin/pom.xml | 6 ++++++
 pom.xml             | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/camel-admin/pom.xml b/camel-admin/pom.xml
index 15ce55f..ffdb02f 100644
--- a/camel-admin/pom.xml
+++ b/camel-admin/pom.xml
@@ -68,6 +68,12 @@
         <dependency>
             <groupId>org.unidal.framework</groupId>
             <artifactId>foundation-service</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>google-collections</artifactId>
+                    <groupId>com.google.collections</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 日志系统 -->
diff --git a/pom.xml b/pom.xml
index 353c3d9..026744c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,6 @@
                 <groupId>org.unidal.framework</groupId>
                 <artifactId>foundation-service</artifactId>
                 <version>2.0.3</version>
-                <scope>provided</scope>
             </dependency>
 
             <!-- java ee dependency -->