From a7b0c55c4b50818d2a4f93f5f2b53c0ad9c0a660 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 31 Jul 2018 19:35:12 +0000 Subject: [PATCH 1/4] 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 a6f54258b..dca982666 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 2a9c95795..6ba5d800a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.0.1.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 583312c80..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.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 4c7ad9ebb..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.0.1.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 3097c344a..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.0.1.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 62b2261b4..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.0.1.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 1711f7c15..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.0.1.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 7ded51954..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.0.1.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 402c28886..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.0.1.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 93ae73dae..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.0.1.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 55eb448f6..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.0.1.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 fc745c03a..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.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 2014643b4..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.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 5d12cc9d9..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.0.1.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 c228e58dc..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.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. spring-cloud-starter-zipkin From 4164e796075229454acaf023b8ff9b359aa4d2a7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 31 Jul 2018 19:36:49 +0000 Subject: [PATCH 2/4] Going back to snapshots --- 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, 26 insertions(+), 33 deletions(-) diff --git a/README.adoc b/README.adoc index 26b7a1c03..1198274d8 100644 --- a/README.adoc +++ b/README.adoc @@ -492,13 +492,6 @@ 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` @@ -604,8 +597,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`, 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. +** If you depend on `spring-rabbit` or `spring-kafka`, your app sends traces to a 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 3d151b5b2..982342aef 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT benchmarks @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.0.4.RELEASE + 2.0.3.RELEASE diff --git a/docs/pom.xml b/docs/pom.xml index dca982666..a6f54258b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 6ba5d800a..2a9c95795 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.0.3.RELEASE + 2.0.2.RELEASE @@ -268,11 +268,11 @@ 1.8 2.19.1 2.17 - 2.0.3.RELEASE - 2.0.1.RELEASE - Elmhurst.SR1 - 2.0.1.RELEASE - 2.0.1.RELEASE + 2.0.2.RELEASE + 2.0.0.BUILD-SNAPSHOT + Elmhurst.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT 5.1.4 2.0.0.RELEASE diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index de7a30584..583312c80 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 7e2aba032..4c7ad9ebb 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.3.RELEASE + 2.0.2.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT 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 cd049f506..3097c344a 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. 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 a7d11354d..62b2261b4 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. 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 92b347e5b..1711f7c15 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. 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 7deb4a7c6..7ded51954 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. 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 c70528c67..402c28886 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. 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 27fd906f4..93ae73dae 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. 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 2f6341ee6..55eb448f6 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. 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 53945d270..fc745c03a 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 42765d770..2014643b4 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 6e874ab7f..5d12cc9d9 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 358b96851..c228e58dc 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.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From 4b2cb752d3d529340e52cb796ab056bc12444975 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 31 Jul 2018 19:36:50 +0000 Subject: [PATCH 3/4] Bumping versions to 2.0.2.BUILD-SNAPSHOT after release --- benchmarks/pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 6 +++--- 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 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 982342aef..26610b132 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.2.BUILD-SNAPSHOT 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 a6f54258b..72df08a74 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 2a9c95795..263acb26b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT 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,7 +268,7 @@ 1.8 2.19.1 2.17 - 2.0.2.RELEASE + 2.0.3.RELEASE 2.0.0.BUILD-SNAPSHOT Elmhurst.BUILD-SNAPSHOT 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 583312c80..97f255d1e 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 4c7ad9ebb..5aed6b3da 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT 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 3097c344a..a38adc92c 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. 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 62b2261b4..8dcb80e6c 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. 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 1711f7c15..214dc226e 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. 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 7ded51954..bf8211a73 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. 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 402c28886..795510949 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. 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 93ae73dae..c650ae86c 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. 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 55eb448f6..19aeca7ce 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. 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 fc745c03a..ed27e5b5a 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 2014643b4..31815c6e2 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 5d12cc9d9..d8c577c37 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index c228e58dc..3402c48ee 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.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From 01688205a841faa39b5dc279ce1d99dee8e2e481 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 14 Aug 2018 16:52:46 +0200 Subject: [PATCH 4/4] Fixed wrong link --- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 6f2eab8fd..161e90819 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -149,7 +149,7 @@ void userCode() { ==== RPC tracing -TIP: Check for https://github.com/openzipkin/sleuth/tree/master/instrumentation[instrumentation written here] and http://zipkin.io/pages/existing_instrumentations.html[Zipkin's list] before rolling your own RPC instrumentation. +TIP: Check for https://github.com/openzipkin/brave/tree/master/instrumentation[instrumentation written here] and http://zipkin.io/pages/existing_instrumentations.html[Zipkin's list] before rolling your own RPC instrumentation. RPC tracing is often done automatically by interceptors. Behind the scenes, they add tags and events that relate to their role in an RPC operation.