SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to latest Brave (#1373)

Browse Source
This commit is contained in:
Adrian Cole
2019-06-15 23:16:08 +08:00
committed by Adrian Cole
parent 5311d07590
commit 1bf9afc9b4
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -279,7 +279,7 @@
<spring-cloud-stream.version>Elmhurst.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
<brave.version>5.6.1</brave.version>
<brave.version>5.6.5</brave.version>
<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
</properties>

2
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -30,7 +30,7 @@
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>
<properties>
<brave.opentracing.version>0.33.10</brave.opentracing.version>
<brave.opentracing.version>0.33.13</brave.opentracing.version>
</properties>
<dependencyManagement>
<dependencies>

2
spring-cloud-sleuth-samples/pom.xml
View File

@@ -73,7 +73,7 @@
<dependency>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin</artifactId>
<version>2.12.0</version>
<version>2.14.2</version>
</dependency>
</dependencies>
</dependencyManagement>

2
spring-cloud-sleuth-zipkin/pom.xml
View File

@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-kafka11</artifactId>
<artifactId>zipkin-sender-kafka</artifactId>
<exclusions>
<!-- assigned with spring-kafka -->
<exclusion>

2
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java
View File

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import zipkin2.reporter.Sender;
import zipkin2.reporter.kafka11.KafkaSender;
import zipkin2.reporter.kafka.KafkaSender;
@Configuration
@ConditionalOnClass(ByteArraySerializer.class)

2
spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfigurationTests.java
View File

@@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import zipkin2.reporter.Sender;
import zipkin2.reporter.amqp.RabbitMQSender;
import zipkin2.reporter.kafka11.KafkaSender;
import zipkin2.reporter.kafka.KafkaSender;
import static org.assertj.core.api.BDDAssertions.then;
import static org.springframework.boot.test.util.EnvironmentTestUtils.addEnvironment;