From be76a076f168d8f5855672a6e77200f40467cd99 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adriancole@users.noreply.github.com>
Date: Thu, 23 Jun 2016 14:41:47 +0800
Subject: [PATCH] Updates to zipkin 1.1.5 (#309)

Changes since 1.1.1 related to cassandra or json parsing.

See https://github.com/openzipkin/zipkin/releases/tag/1.1.5
---
 spring-cloud-sleuth-dependencies/pom.xml | 2 +-
 spring-cloud-sleuth-samples/pom.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 1fd8f130f..7b2d3a16c 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -16,7 +16,7 @@
 	<properties>
 		<spring-cloud-netflix.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
-		<zipkin.version>1.1.1</zipkin.version>
+		<zipkin.version>1.1.5</zipkin.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index ccb989e76..65e702ae6 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -59,12 +59,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>1.1.1</version>
+				<version>1.1.5</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>1.1.1</version>
+				<version>1.1.5</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>