diff --git a/README.adoc b/README.adoc
index 096658952..3a556fc81 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,8 @@
-// Do not edit this file (e.g. go instead to src/main/asciidoc)
+////
+DO NOT EDIT THIS FILE. IT WAS GENERATED.
+Manual changes to this file will be lost when it is generated again.
+Edit the files in the src/main/asciidoc/ directory instead.
+////
:jdkversion: 1.8
:github-tag: master
@@ -715,7 +719,7 @@ credentials and you already have those.
The projects that require middleware generally include a
`docker-compose.yml`, so consider using
-https://compose.docker.io/[Docker Compose] to run the middeware servers
+https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
in Docker containers. See the README in the
https://github.com/spring-cloud-samples/scripts[scripts demo
repository] for specific instructions about the common cases of mongo,
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 367001457..90aa581da 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,7 +22,7 @@
Benchmarks
Benchmarks (JMH)
org.springframework.cloud
- 2.1.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
benchmarks
@@ -33,7 +33,7 @@
true
1.8
1.8
- 2.1.3.RELEASE
+ 2.1.6.RELEASE
5.6.5
diff --git a/docs/pom.xml b/docs/pom.xml
index 0c8de5bad..f334735fa 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.1.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
spring-cloud-sleuth-docs
pom
diff --git a/pom.xml b/pom.xml
index d1c3b11fa..9db25fe78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
4.0.0
spring-cloud-sleuth
- 2.1.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
pom
Spring Cloud Sleuth
Spring Cloud Sleuth
@@ -29,7 +29,7 @@
org.springframework.cloud
spring-cloud-build
- 2.1.6.BUILD-SNAPSHOT
+ 2.1.6.RELEASE
@@ -258,13 +258,12 @@
1.8
1.8
1.8
- 2.1.6.BUILD-SNAPSHOT
- 2.1.2.BUILD-SNAPSHOT
- 2.1.2.BUILD-SNAPSHOT
- Fishtown.BUILD-SNAPSHOT
- 2.1.2.BUILD-SNAPSHOT
- 2.1.2.BUILD-SNAPSHOT
-
+ 2.1.6.RELEASE
+ 2.1.2.RELEASE
+ 2.1.2.RELEASE
+ Fishtown.SR3
+ 2.1.2.RELEASE
+ 2.1.2.RELEASE
5.6.5
2.1.2.RELEASE
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index deb9b763c..5859c8444 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.1.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
..
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
index 248f428bb..737afeccb 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
@@ -122,8 +122,7 @@ public class TraceWebAutoConfiguration {
String basePath = webEndpointProperties.getBasePath();
String pattern = endpoints.stream().map(PathMappedEndpoint::getRootPath)
.map(path -> path + "|" + path + "/.*")
- .collect(Collectors.joining("|",
- getPathPrefix(contextPath, basePath),
+ .collect(Collectors.joining("|", getPathPrefix(contextPath, basePath),
getPathSuffix(contextPath, basePath)));
if (StringUtils.hasText(pattern)) {
return Optional.of(Pattern.compile(pattern));
@@ -149,9 +148,8 @@ public class TraceWebAutoConfiguration {
private static String getPathSuffix(String contextPath, String actuatorBasePath) {
String result = ")";
- if (StringUtils.hasText(contextPath) ||
- (StringUtils.hasText(actuatorBasePath)
- && !"/".equals(actuatorBasePath))) {
+ if (StringUtils.hasText(contextPath) || (StringUtils.hasText(actuatorBasePath)
+ && !"/".equals(actuatorBasePath))) {
result += ")?";
}
return result;
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java
index 0ec2a0eb1..05744e668 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SkipPatternProviderConfigTest.java
@@ -181,7 +181,8 @@ public class SkipPatternProviderConfigTest {
.skipPattern();
then(pattern).isNotEmpty();
- then(pattern.get().pattern()).isEqualTo("foo(/|/(info|info/.*|health|health/.*))?");
+ then(pattern.get().pattern())
+ .isEqualTo("foo(/|/(info|info/.*|health|health/.*))?");
}
@Test
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 7f5e8f0ed..a06f40b1b 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.1.3.BUILD-SNAPSHOT
+ 2.1.6.RELEASE
spring-cloud-sleuth-dependencies
- 2.1.2.BUILD-SNAPSHOT
+ 2.1.2.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 7b476f7c9..145e044ce 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.2.BUILD-SNAPSHOT
+ 2.1.2.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 83d5c6c21..595c3c22d 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.1.2.BUILD-SNAPSHOT
+ 2.1.2.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 bbe022ce6..9ccd4746f 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.2.BUILD-SNAPSHOT
+ 2.1.2.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 d5f669fda..f06a3f837 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.2.BUILD-SNAPSHOT
+ 2.1.2.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 ae625b8d6..429d1afe4 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.2.BUILD-SNAPSHOT
+ 2.1.2.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 eac7b92b0..7ff469319 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.2.BUILD-SNAPSHOT
+ 2.1.2.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 a0616670b..458bfbbc1 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.1.2.BUILD-SNAPSHOT
+ 2.1.2.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 0f022e596..28281d8d1 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.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
..
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index fad01add6..c86b69f37 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.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
..
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index d437c6cd8..b627b7115 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.1.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
..
spring-cloud-starter-sleuth
diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml
index a2791401f..41d03ea38 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.1.2.BUILD-SNAPSHOT
+ 2.1.2.RELEASE
..
spring-cloud-starter-zipkin