diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index d94e8ea74..01b9c303a 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,7 +22,7 @@
Benchmarks
Benchmarks (JMH)
org.springframework.cloud
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
benchmarks
@@ -33,7 +33,7 @@
true
1.8
1.8
- 2.2.0.RC1
+ 2.2.0.BUILD-SNAPSHOT
5.8.0
diff --git a/docs/pom.xml b/docs/pom.xml
index a780ba9ec..1cabb3189 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
spring-cloud-sleuth-docs
pom
diff --git a/pom.xml b/pom.xml
index 562d24f14..f8f02110a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
4.0.0
spring-cloud-sleuth
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
pom
Spring Cloud Sleuth
Spring Cloud Sleuth
@@ -29,7 +29,7 @@
org.springframework.cloud
spring-cloud-build
- 2.2.0.M6
+ 2.2.0.BUILD-SNAPSHOT
@@ -248,15 +248,16 @@
1.8
1.8
1.8
- 2.2.0.M6
- 2.2.0.M3
- 2.2.0.M3
- Horsham.M4
- 2.2.0.M3
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
+ 2.2.0.BUILD-SNAPSHOT
+ 2.2.0.BUILD-SNAPSHOT
+ Horsham.BUILD-SNAPSHOT
+ 2.2.0.BUILD-SNAPSHOT
+ 2.2.0.BUILD-SNAPSHOT
+
2.1.7.RELEASE
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
false
3.10.0
3.10.0
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index 3b5caece6..5227c9203 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -28,7 +28,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
index 3028c6f90..916b589b4 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
@@ -237,8 +237,7 @@ class RestTemplateInterceptorInjector {
private boolean hasTraceInterceptor(RestTemplate restTemplate) {
for (ClientHttpRequestInterceptor interceptor : restTemplate.getInterceptors()) {
- if (interceptor instanceof TracingClientHttpRequestInterceptor
- || interceptor instanceof LazyTracingClientHttpRequestInterceptor) {
+ if (interceptor instanceof TracingClientHttpRequestInterceptor || interceptor instanceof LazyTracingClientHttpRequestInterceptor) {
return true;
}
}
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java
index a8f81a8ed..3bf6ba104 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java
@@ -104,8 +104,7 @@ public class TraceWebClientAutoConfigurationTests {
.containsOnlyElementsOf(Collections.singletonList(1));
}
- private void incrementNumberOfInstances(Map numberOfInstances,
- ClientHttpRequestInterceptor interceptor) {
+ private void incrementNumberOfInstances(Map numberOfInstances, ClientHttpRequestInterceptor interceptor) {
Integer no = numberOfInstances.get(interceptor.getClass());
if (no == null) {
numberOfInstances.put(interceptor.getClass(), 1);
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 3f1a37810..ee08eec5d 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -22,11 +22,11 @@
spring-cloud-dependencies-parent
org.springframework.cloud
- 2.2.0.M6
+ 2.2.0.BUILD-SNAPSHOT
spring-cloud-sleuth-dependencies
- 2.2.0.M3
+ 2.2.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 460f83fb1..8ac5d5567 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.2.0.M3
+ 2.2.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 f0d4c5b81..7d1892f83 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
@@ -28,7 +28,7 @@
org.springframework.cloud
spring-cloud-sleuth-samples
- 2.2.0.M3
+ 2.2.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 27a59fe7c..703b071f1 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.2.0.M3
+ 2.2.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 9c558539b..def1baa0a 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.2.0.M3
+ 2.2.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 f01409e64..ec7719482 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.2.0.M3
+ 2.2.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 6d7ddb982..0dccb78f8 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.2.0.M3
+ 2.2.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 533a06eab..325134f30 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
@@ -28,7 +28,7 @@
org.springframework.cloud
spring-cloud-sleuth-samples
- 2.2.0.M3
+ 2.2.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 2caee0aff..bc3fb4cc1 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.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index 3bc4415ef..ba49fe9a7 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.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index 3149fe6b5..bb2b2b200 100644
--- a/spring-cloud-starter-sleuth/pom.xml
+++ b/spring-cloud-starter-sleuth/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
spring-cloud-starter-sleuth
diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml
index d1f239dcb..41516a65c 100644
--- a/spring-cloud-starter-zipkin/pom.xml
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
spring-cloud-starter-zipkin
diff --git a/tests/pom.xml b/tests/pom.xml
index fdf5ec31c..91f080d1c 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
index 7cb475d69..fe90660f8 100644
--- a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
index d80169fe6..184214792 100644
--- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
index 014cd15a4..ffc5655b4 100644
--- a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml
index 88c61e4ce..1c05e01cd 100644
--- a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
index 2088c0a11..1a847c19e 100644
--- a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
index 26e4ac970..1f8c3f608 100644
--- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
@@ -31,7 +31,7 @@ https://www.w3.org/2001/XMLSchema-instance ">
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
index ce022e329..f464a7995 100644
--- a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
index e2303598b..c8a2a8c94 100644
--- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml
index 7e36047b3..4270380c7 100644
--- a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
index c51a8ec67..2eb6ab71a 100644
--- a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
index f1e125ba5..db439b406 100644
--- a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
index e713711e7..5c60e2bb0 100644
--- a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml
index 8fcc7c578..826909680 100644
--- a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml
+++ b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth-tests
- 2.2.0.M3
+ 2.2.0.BUILD-SNAPSHOT
..