From 1ec5d4f636c7e3379f1229973e5962815f9e4e06 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Mon, 14 Dec 2015 15:23:21 +0800
Subject: [PATCH] Cleans up unused brave refs and consolidates to zipkin docker
 1.26.0

---
 pom.xml                                       | 36 -------------------
 .../docker-compose.yml                        |  2 +-
 spring-cloud-sleuth-stream/docker-compose.yml | 35 ------------------
 spring-cloud-sleuth-zipkin/docker-compose.yml | 10 +++---
 4 files changed, 6 insertions(+), 77 deletions(-)
 delete mode 100644 spring-cloud-sleuth-stream/docker-compose.yml

diff --git a/pom.xml b/pom.xml
index b28d7bb4c..852d0d0db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,47 +118,11 @@
 				<artifactId>spring-cloud-starter-sleuth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.github.kristofa</groupId>
-				<artifactId>brave-core</artifactId>
-				<version>${brave.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.github.kristofa</groupId>
-				<artifactId>brave-http</artifactId>
-				<version>${brave.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.github.kristofa</groupId>
-				<artifactId>brave-core-spring</artifactId>
-				<version>${brave.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>com.github.kristofa</groupId>
 				<artifactId>brave-spancollector-scribe</artifactId>
 				<version>${brave.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.github.kristofa</groupId>
-				<artifactId>brave-tracefilters</artifactId>
-				<version>${brave.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.github.kristofa</groupId>
-				<artifactId>flume-zipkin-collector-sink</artifactId>
-				<version>${brave.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.github.kristofa</groupId>
-				<artifactId>flume-zipkin-metrics-sink</artifactId>
-				<version>${brave.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjrt</artifactId>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
index a85bc67f5..96299f6cd 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
@@ -28,7 +28,7 @@ zipkin:
     - mysql
     - rabbitmq
 web:
-  image: openzipkin/zipkin-web:1.25.3
+  image: openzipkin/zipkin-web:1.26.0
   ports:
     - 8080:8080
   environment:
diff --git a/spring-cloud-sleuth-stream/docker-compose.yml b/spring-cloud-sleuth-stream/docker-compose.yml
deleted file mode 100644
index ae9ea8b0d..000000000
--- a/spring-cloud-sleuth-stream/docker-compose.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-cassandra:
-  image: quay.io/openzipkin/zipkin-cassandra:1.9.0
-  ports:
-    - 9042:9042
-collector:
-  image: quay.io/openzipkin/zipkin-collector:1.9.0
-  environment:
-    - BLOCK_ON_CASSANDRA=true
-  expose:
-    - 9410
-  ports:
-    - 9410:9410
-    - 9900:9900
-  links:
-    - cassandra:db
-query:
-  image: quay.io/openzipkin/zipkin-query:1.9.0
-  environment:
-    - BLOCK_ON_CASSANDRA=true
-  expose:
-    - 9411
-  ports:
-    - 9411:9411
-    - 9901:9901
-  links:
-    - cassandra:db
-    - collector
-web:
-  image: quay.io/openzipkin/zipkin-web:1.9.0
-  ports:
-    - 8080:8080
-    - 9990:9990
-  links:
-    - collector
-    - query
diff --git a/spring-cloud-sleuth-zipkin/docker-compose.yml b/spring-cloud-sleuth-zipkin/docker-compose.yml
index 85ea87952..96412aba0 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.25.0
+  image: openzipkin/zipkin-mysql:1.26.0
   ports:
     - 3306:3306
 collector:
-  image: openzipkin/zipkin-collector:1.25.0
+  image: openzipkin/zipkin-collector:1.26.0
   environment:
     - TRANSPORT_TYPE=scribe
     - STORAGE_TYPE=mysql
@@ -15,7 +15,7 @@ collector:
   links:
     - mysql:storage
 query:
-  image: openzipkin/zipkin-query:1.25.0
+  image: openzipkin/zipkin-query:1.26.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -28,7 +28,7 @@ query:
   links:
     - mysql:storage
 web:
-  image: openzipkin/zipkin-web:1.25.0
+  image: openzipkin/zipkin-web:1.26.0
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
@@ -36,4 +36,4 @@ web:
     - 8080:8080
     - 9990:9990
   links:
-    - query
\ No newline at end of file
+    - query