From 5ae1e63fd3b16d790b02dd56b7546107492af92c Mon Sep 17 00:00:00 2001
From: Willem Jiang <jiangning9@huawei.com>
Date: Fri, 29 Dec 2017 22:25:15 +0800
Subject: [PATCH] SCB-146 Upgarded Zipkin Brave to 4.13.1

---
 java-chassis-dependencies/pom.xml                              | 2 +-
 .../io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java    | 3 ++-
 .../servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index 26ccb6ac1b..78ea72413e 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -48,7 +48,7 @@
     <narayana.version>5.3.2.Final</narayana.version>
     <cxf.version>3.1.6</cxf.version>
     <logback.version>1.1.7</logback.version>
-    <brave.version>4.4.0</brave.version>
+    <brave.version>4.13.1</brave.version>
     <zipkin.version>1.24.0</zipkin.version>
     <zipkin-reporter.version>0.10.0</zipkin-reporter.version>
   </properties>
diff --git a/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java b/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
index cbcf5c03ab..a05cf1f801 100644
--- a/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
+++ b/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
@@ -39,7 +39,8 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 import brave.Tracing;
-import brave.internal.StrictCurrentTraceContext;
+import brave.propagation.StrictCurrentTraceContext;
+
 import io.servicecomb.tracing.zipkin.ZipkinSpanAspectTest.TracingConfig;
 import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication;
 import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.CustomSpanTask;
diff --git a/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java b/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
index 6574ec3446..0040b81663 100644
--- a/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
+++ b/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
@@ -44,7 +44,7 @@
 import brave.Span;
 import brave.Tracer.SpanInScope;
 import brave.Tracing;
-import brave.internal.StrictCurrentTraceContext;
+import brave.propagation.StrictCurrentTraceContext;
 import io.servicecomb.tracing.zipkin.ZipkinTracingAdviser.ThrowableSupplier;
 
 public class ZipkinTracingAdviserTest {