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

Updates to zipkin version fixing encoding bug

Browse Source
This commit is contained in:
Adrian Cole
2017-11-10 15:21:21 +08:00
committed by Marcin Grzejszczak
parent b60ff42fc8
commit dfc5ae57bb
2 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,18 +5,17 @@
<parent> <parent>
<artifactId>spring-cloud-dependencies-parent</artifactId> <artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<version>1.3.6.BUILD-SNAPSHOT</version> <version>1.3.5.BUILD-SNAPSHOT</version>
<relativePath/> <relativePath/>
</parent> </parent>
<artifactId>spring-cloud-sleuth-dependencies</artifactId> <artifactId>spring-cloud-sleuth-dependencies</artifactId>
<version>1.3.0.BUILD-SNAPSHOT</version> <version>1.2.6.BUILD-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>spring-cloud-sleuth-dependencies</name> <name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description> <description>Spring Cloud Sleuth Dependencies</description>
<properties> <properties>
<zipkin.version>2.2.2</zipkin.version> <zipkin.version>2.2.2</zipkin.version>
<zipkin-reporter.version>1.1.2</zipkin-reporter.version> <zipkin-reporter.version>1.1.2</zipkin-reporter.version>
<zipkin-reporter2.version>2.1.4</zipkin-reporter2.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@@ -25,16 +24,6 @@
<artifactId>spring-cloud-sleuth-core</artifactId> <artifactId>spring-cloud-sleuth-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-reactor</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-zipkin-legacy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-zipkin</artifactId> <artifactId>spring-cloud-sleuth-zipkin</artifactId>
@@ -50,11 +39,6 @@
<artifactId>spring-cloud-sleuth-zipkin-stream</artifactId> <artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zipkin-legacy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zipkin</artifactId> <artifactId>spring-cloud-starter-zipkin</artifactId>
@@ -101,35 +85,6 @@
<artifactId>zipkin-reporter</artifactId> <artifactId>zipkin-reporter</artifactId>
<version>${zipkin-reporter.version}</version> <version>${zipkin-reporter.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter</artifactId>
<version>${zipkin-reporter2.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-kafka11</artifactId>
<version>${zipkin-reporter2.version}</version>
<exclusions>
<!-- assigned with spring-kafka -->
<exclusion>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-amqp-client</artifactId>
<version>${zipkin-reporter2.version}</version>
<exclusions>
<!-- assigned with spring-rabbit -->
<exclusion>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<profiles> <profiles>

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

@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId> <artifactId>spring-cloud-sleuth</artifactId>
<version>1.3.0.BUILD-SNAPSHOT</version> <version>1.2.6.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
@@ -24,6 +24,8 @@
<module>spring-cloud-sleuth-sample-feign</module> <module>spring-cloud-sleuth-sample-feign</module>
<module>spring-cloud-sleuth-sample-ribbon</module> <module>spring-cloud-sleuth-sample-ribbon</module>
<module>spring-cloud-sleuth-sample-zipkin</module> <module>spring-cloud-sleuth-sample-zipkin</module>
<module>spring-cloud-sleuth-sample-stream</module>
<module>spring-cloud-sleuth-sample-zipkin-stream</module>
</modules> </modules>
<build> <build>
@@ -55,10 +57,15 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.zipkin.zipkin2</groupId> <groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId> <artifactId>zipkin</artifactId>
<version>2.2.2</version> <version>2.2.2</version>
</dependency> </dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
<version>2.2.2</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>