Merge branch 'master' into 2.0.x

2017-10-20 11:12:01 +02:00
parent 1f9a19c54c 3b577d9760
commit eb9f0f5f5f
1 changed files with 4 additions and 0 deletions
--- a/spring-cloud-sleuth-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-zipkin-stream/pom.xml
@@ -65,6 +65,10 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>*</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>io.zipkin.zipkin2</groupId>
+					<artifactId>zipkin</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>