Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-07-06 16:08:30 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -14,8 +14,8 @@
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>
<properties>
<zipkin.version>1.23.2</zipkin.version>
<zipkin-reporter.version>0.7.0</zipkin-reporter.version>
<zipkin.version>1.28.0</zipkin.version>
<zipkin-reporter.version>1.0.0</zipkin-reporter.version>
</properties>
<dependencyManagement>
<dependencies>

View File

@@ -59,12 +59,12 @@
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId>
<version>1.23.2</version>
<version>1.28.0</version>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
<version>1.23.2</version>
<version>1.28.0</version>
</dependency>
</dependencies>
</dependencyManagement>