From 3dfc4b0be283cd8dded5e7a4af510448d1d0a816 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 20 Dec 2018 21:28:46 +0000 Subject: [PATCH] Going back to snapshots --- README.adoc | 3 ++- 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(+), 25 deletions(-) diff --git a/README.adoc b/README.adoc index b73b066ff..053bdf7a8 100644 --- a/README.adoc +++ b/README.adoc @@ -123,7 +123,7 @@ That means that, if there were two spans sent to Zipkin with Server Received and Why is there a difference between the seven and four spans in this case? -* One span comes from the `http:/start` span. It has the Server Received (`sr`) and Server Sent (`ss`) annotations. +* Two spans come from the `http:/start` span. It has the Server Received (`sr`) and Server Sent (`ss`) annotations. * Two spans come from the RPC call from `service1` to `service2` to the `http:/foo` endpoint. The Client Sent (`cs`) and Client Received (`cr`) events took place on the `service1` side. Server Received (`sr`) and Server Sent (`ss`) events took place on the `service2` side. @@ -344,6 +344,7 @@ The following example shows setting baggage on a span: Span initialSpan = this.tracer.nextSpan().name("span").start(); ExtraFieldPropagation.set(initialSpan.context(), "foo", "bar"); ExtraFieldPropagation.set(initialSpan.context(), "UPPER_CASE", "someValue"); +} ---- ===== Baggage versus Span Tags diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 287bd757e..a2e0b91a9 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.1.0.RC3 + 2.1.0.BUILD-SNAPSHOT benchmarks @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.1.1.RELEASE + 2.1.0.RELEASE 5.4.3 diff --git a/docs/pom.xml b/docs/pom.xml index fad246cfa..3056af1f7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.RC3 + 2.1.0.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 90491b767..e8de33455 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.1.0.RC3 + 2.1.0.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.1.0.RC3 + 2.1.0.BUILD-SNAPSHOT @@ -242,11 +242,11 @@ 1.8 1.8 1.8 - 2.1.0.RC3 - 2.1.0.RC2 - Fishtown.RC4 - 2.1.0.RC3 - 2.1.0.RC3 + 2.1.0.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT + Fishtown.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT 5.6.0 2.0.4.RELEASE diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 0e45a7a81..1534a4b2f 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.RC3 + 2.1.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 1f9444b3b..29bcc3985 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.1.0.RC3 + 2.1.0.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies - 2.1.0.RC3 + 2.1.0.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 e2ffdc4a0..403815415 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.RC3 + 2.1.0.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 14f6d0b5d..481dfa076 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.RC3 + 2.1.0.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 1a191181f..283cef34a 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.RC3 + 2.1.0.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 b3a3a067a..bb06e9074 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.RC3 + 2.1.0.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 5749a18f2..91d952916 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.RC3 + 2.1.0.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 88a993c11..914b91e7e 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.RC3 + 2.1.0.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 6e12bb923..b00f3b9a5 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.RC3 + 2.1.0.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 55406a072..d6efe3e81 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.RC3 + 2.1.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index ab1b2eefa..9488ceb1b 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.RC3 + 2.1.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 8de9c8289..38817e4c1 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.RC3 + 2.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 07e915a3a..5c0b81ad2 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.RC3 + 2.1.0.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin