From 075a373127657ab13186623c0381ee390b6e7baa Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Thu, 18 Feb 2016 15:31:51 +0800
Subject: [PATCH] Updates to zipkin 0.5.3

This includes updates to the latest zipkin-web image and zipkin-java
dependency.

zipkin-web's notable as it does a lot more in javascript, ex it no
longer does server-side mustache template rendering. It also makes one
less call to the services endpoint when rendering the search page.

zipkin-java's in-memory span store is now in the core jar and also can
render the dependency tree. This means it is now feature-parity with
mysql (but still merely a test span-store). zipkin-java also now tests
that it can run without optional dependencies.
---
 spring-cloud-sleuth-dependencies/pom.xml                    | 2 +-
 spring-cloud-sleuth-samples/pom.xml                         | 4 ++--
 .../spring-cloud-sleuth-sample-zipkin/docker-compose.yml    | 6 +++---
 spring-cloud-sleuth-zipkin/docker-compose.yml               | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 38d612d3c..65e9461f5 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -17,7 +17,7 @@
 		<brave.version>3.4.0</brave.version>
 		<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
-		<zipkin-java.version>0.5.2</zipkin-java.version>
+		<zipkin-java.version>0.5.3</zipkin-java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 1f81c1711..08e5d0944 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -62,12 +62,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>0.5.2</version>
+				<version>0.5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>0.5.2</version>
+				<version>0.5.3</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
index 8b3ad486f..7a83209fb 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml
@@ -1,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.33.0
+  image: openzipkin/zipkin-mysql:1.33.2
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.5.2
+  image: openzipkin/zipkin-java:0.5.3
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -16,7 +16,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.33.0
+  image: openzipkin/zipkin-web:1.33.2
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
diff --git a/spring-cloud-sleuth-zipkin/docker-compose.yml b/spring-cloud-sleuth-zipkin/docker-compose.yml
index 8b3ad486f..7a83209fb 100644
--- a/spring-cloud-sleuth-zipkin/docker-compose.yml
+++ b/spring-cloud-sleuth-zipkin/docker-compose.yml
@@ -1,9 +1,9 @@
 mysql:
-  image: openzipkin/zipkin-mysql:1.33.0
+  image: openzipkin/zipkin-mysql:1.33.2
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.5.2
+  image: openzipkin/zipkin-java:0.5.3
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -16,7 +16,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.33.0
+  image: openzipkin/zipkin-web:1.33.2
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http