From d9e9b45f78483c3e53706ae2444aeafe35a7c80b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 31 Jul 2018 19:35:12 +0000 Subject: [PATCH] Update SNAPSHOT to 2.0.1.RELEASE --- README.adoc | 11 +++++++++-- benchmarks/pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-sleuth-core/pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 4 ++-- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../spring-cloud-sleuth-sample-messaging/pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../spring-cloud-sleuth-sample-test-core/pom.xml | 2 +- .../spring-cloud-sleuth-sample-websocket/pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 17 files changed, 33 insertions(+), 26 deletions(-) diff --git a/README.adoc b/README.adoc index 1198274d8..26b7a1c03 100644 --- a/README.adoc +++ b/README.adoc @@ -492,6 +492,13 @@ dependencies { <2> If you want to use RabbitMQ or Kafka instead of HTTP, add the `spring-rabbit` or `spring-kafka` dependency. The default destination name is `zipkin`. +If using Kafka, you must set the property `spring.zipkin.sender.type` property accordingly: + +[source,yaml] +---- +spring.zipkin.sender.type: kafka +---- + CAUTION: `spring-cloud-sleuth-stream` is deprecated and incompatible with these destinations. If you want Sleuth over RabbitMQ, add the `spring-cloud-starter-zipkin` and `spring-rabbit` @@ -597,8 +604,8 @@ Consequently, if you set a baggage element on a Span, it is sent downstream to * If `spring-cloud-sleuth-zipkin` is on the classpath, the app generates and collects Zipkin-compatible traces. By default, it sends them over HTTP to a Zipkin server on localhost (port 9411). You can configure the location of the service by setting `spring.zipkin.baseUrl`. -** If you depend on `spring-rabbit` or `spring-kafka`, your app sends traces to a broker instead of HTTP. -** +** If you depend on `spring-rabbit`, your app sends traces to a RabbitMQ broker instead of HTTP. +** If you depend on `spring-kafka`, and set `spring.zipkin.sender.type: kafka`, your app sends traces to a Kafka broker instead of HTTP. CAUTION: `spring-cloud-sleuth-stream` is deprecated and should no longer be used. diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 982342aef..3d151b5b2 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE benchmarks @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.0.3.RELEASE + 2.0.4.RELEASE diff --git a/docs/pom.xml b/docs/pom.xml index 3056af1f7..dca982666 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 212baa82f..6ba5d800a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.0.2.RELEASE + 2.0.3.RELEASE @@ -268,11 +268,11 @@ 1.8 2.19.1 2.17 - 2.0.2.RELEASE - 2.0.0.BUILD-SNAPSHOT - Elmhurst.BUILD-SNAPSHOT - 2.0.0.BUILD-SNAPSHOT - 2.0.0.BUILD-SNAPSHOT + 2.0.3.RELEASE + 2.0.1.RELEASE + Elmhurst.SR1 + 2.0.1.RELEASE + 2.0.1.RELEASE 5.1.4 2.0.0.RELEASE diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 924ec10da..de7a30584 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index f1c0e05eb..7e2aba032 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -21,11 +21,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE spring-cloud-sleuth-dependencies - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 920349bee..cd049f506 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml index 4dc515e57..a7d11354d 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml index 283cef34a..92b347e5b 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml index bb06e9074..7deb4a7c6 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml index b53221fc7..c70528c67 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml index 914b91e7e..27fd906f4 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml index b00f3b9a5..2f6341ee6 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml index ea89767e0..53945d270 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index b34430f07..42765d770 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 38817e4c1..6e874ab7f 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 5c0b81ad2..358b96851 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.0.1.RELEASE .. spring-cloud-starter-zipkin