From b356abcb072c6f2950dbdb06f3f652208d33ba05 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Wed, 9 Mar 2016 11:09:39 +0800
Subject: [PATCH] Updates to latest zipkin 0.7

This is a maintenance update to zipkin which has no api impact.

* zipkin-server supports cassandra now
* zipkin-web is now javascript (even if still hosted on a scala process)
---
 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 b7806f348..6fc572c37 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.6.0</zipkin-java.version>
+		<zipkin-java.version>0.7.0</zipkin-java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 15fc88916..7ea2f6d0d 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.6.0</version>
+				<version>0.7.0</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>0.6.0</version>
+				<version>0.7.0</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 39d546d2b..1cd2aebee 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.34.0
+  image: openzipkin/zipkin-mysql:1.36.0
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.6.0
+  image: openzipkin/zipkin-java:0.7.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -16,7 +16,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.34.0
+  image: openzipkin/zipkin-web:1.36.0
   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 39d546d2b..1cd2aebee 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.34.0
+  image: openzipkin/zipkin-mysql:1.36.0
   ports:
     - 3306:3306
 query:
-  image: openzipkin/zipkin-java:0.6.0
+  image: openzipkin/zipkin-java:0.7.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -16,7 +16,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.34.0
+  image: openzipkin/zipkin-web:1.36.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http