From 663d4f4a001c4c7ee5e91992a9230132ac8eae3a Mon Sep 17 00:00:00 2001
From: yong.xie <yong.xie@yoho.cn>
Date: Tue, 16 Feb 2016 18:05:24 +0800
Subject: [PATCH] 排除冲突的包
---
pom.xml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e688f9b..3ad0c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -607,7 +607,17 @@
<dependency>
<groupId>com.netflix.hystrix</groupId>
<artifactId>hystrix-metrics-event-stream</artifactId>
- <version>1.4.21</version>
+ <version>1.4.21</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-databind</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jackson-annotations</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--config -->
<dependency>
--
libgit2 0.24.0