Merge branch 'master' into 2.0.x

docs/src/main/asciidoc/spring-cloud-sleuth.adoc

@@ -444,7 +444,7 @@ Below you can see an example of a call to Redis that is wrapped in such a span.
 
 [source,java]
 ----
-include::../../../..//spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java[tags=service_name,indent=0]
+include::../../../..//spring-cloud-sleuth-zipkin-legacy/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java[tags=service_name,indent=0]
 ----
 
 IMPORTANT: Remember not to add both `peer.service` tag and the `SA` tag! You have to add only `peer.service`.

spring-cloud-sleuth-dependencies/pom.xml

@@ -14,7 +14,7 @@
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
 	<properties>
-		<zipkin.version>2.2.2</zipkin.version>
+		<zipkin.version>2.3.1</zipkin.version>
 		<zipkin-reporter.version>1.1.2</zipkin-reporter.version>
 		<zipkin-reporter2.version>2.1.4</zipkin-reporter2.version>
 	</properties>
@@ -69,7 +69,7 @@
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
 				<!-- misaligned intentionally https://github.com/spring-projects/spring-boot/issues/10778-->
-				<version>2.2.1</version>
+				<version>2.3.0</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.zipkin2</groupId>

spring-cloud-sleuth-samples/pom.xml

@@ -57,7 +57,7 @@
 			<dependency>
 				<groupId>io.zipkin.zipkin2</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>2.2.2</version>
+				<version>2.3.1</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>