Merge branch 'master' into 2.0.x

2017-10-19 18:15:17 +02:00
parent 6b772cef2a 5b52ddc312
commit 1f9a19c54c
1 changed files with 6 additions and 0 deletions
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -82,6 +82,12 @@
 		<dependency>
 			<groupId>io.zipkin.reporter</groupId>
 			<artifactId>zipkin-reporter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>io.zipkin.zipkin2</groupId>
+					<artifactId>zipkin</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>