From 0a4e7b5d7bc39ee1329c849767bb6426b32dde8b Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Thu, 20 Jun 2019 21:26:50 +0000
Subject: [PATCH] Going back to snapshots

---
 README.adoc                                     |  8 ++------
 benchmarks/pom.xml                              |  4 ++--
 docs/pom.xml                                    |  2 +-
 pom.xml                                         | 17 +++++++++--------
 spring-cloud-sleuth-core/pom.xml                |  2 +-
 .../web/TraceWebAutoConfiguration.java          |  8 +++++---
 .../web/SkipPatternProviderConfigTest.java      |  3 +--
 spring-cloud-sleuth-dependencies/pom.xml        |  4 ++--
 spring-cloud-sleuth-samples/pom.xml             |  2 +-
 .../spring-cloud-sleuth-sample-feign/pom.xml    |  2 +-
 .../pom.xml                                     |  2 +-
 .../spring-cloud-sleuth-sample-ribbon/pom.xml   |  2 +-
 .../pom.xml                                     |  2 +-
 .../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 +-
 19 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/README.adoc b/README.adoc
index 3a556fc81..096658952 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,8 +1,4 @@
-////
-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.
-////
+// Do not edit this file (e.g. go instead to src/main/asciidoc)
 
 :jdkversion: 1.8
 :github-tag: master
@@ -719,7 +715,7 @@ credentials and you already have those.
 
 The projects that require middleware generally include a
 `docker-compose.yml`, so consider using
-https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
+https://compose.docker.io/[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 90aa581da..367001457 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,7 +22,7 @@
 	<name>Benchmarks</name>
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.1.2.RELEASE</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<artifactId>benchmarks</artifactId>
 
 	<properties>
@@ -33,7 +33,7 @@
 		<sonar.skip>true</sonar.skip>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
-		<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
+		<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
 		<brave.version>5.6.5</brave.version>
 	</properties>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index f334735fa..0c8de5bad 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-sleuth-docs</artifactId>
 	<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 9db25fe78..d1c3b11fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-sleuth</artifactId>
-	<version>2.1.2.RELEASE</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Sleuth</name>
 	<description>Spring Cloud Sleuth</description>
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.6.RELEASE</version>
+		<version>2.1.6.BUILD-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -258,12 +258,13 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
 		<maven.compiler.testSource>1.8</maven.compiler.testSource>
-		<spring-cloud-build.version>2.1.6.RELEASE</spring-cloud-build.version>
-		<spring-cloud-commons.version>2.1.2.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-gateway.version>2.1.2.RELEASE</spring-cloud-gateway.version>
-		<spring-cloud-stream.version>Fishtown.SR3</spring-cloud-stream.version>
-		<spring-cloud-netflix.version>2.1.2.RELEASE</spring-cloud-netflix.version>
-		<spring-cloud-openfeign.version>2.1.2.RELEASE</spring-cloud-openfeign.version>
+		<spring-cloud-build.version>2.1.6.BUILD-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-commons.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-gateway.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-gateway.version>
+		<spring-cloud-stream.version>Fishtown.BUILD-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-netflix.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-openfeign.version>2.1.2.BUILD-SNAPSHOT
+		</spring-cloud-openfeign.version>
 		<brave.version>5.6.5</brave.version>
 		<spring-security-boot-autoconfigure.version>2.1.2.RELEASE
 		</spring-security-boot-autoconfigure.version>
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index 5859c8444..deb9b763c 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 737afeccb..248f428bb 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,7 +122,8 @@ 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));
@@ -148,8 +149,9 @@ 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 05744e668..0ec2a0eb1 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,8 +181,7 @@ 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 a06f40b1b..7f5e8f0ed 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -22,11 +22,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.6.RELEASE</version>
+		<version>2.1.3.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-	<version>2.1.2.RELEASE</version>
+	<version>2.1.2.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 145e044ce..7b476f7c9 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 595c3c22d..83d5c6c21 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 9ccd4746f..bbe022ce6 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 f06a3f837..d5f669fda 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 429d1afe4..ae625b8d6 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 7ff469319..eac7b92b0 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 458bfbbc1..a0616670b 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 28281d8d1..0f022e596 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth-samples</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index c86b69f37..fad01add6 100644
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index b627b7115..d437c6cd8 100644
--- a/spring-cloud-starter-sleuth/pom.xml
+++ b/spring-cloud-starter-sleuth/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-sleuth</artifactId>
diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml
index 41d03ea38..a2791401f 100644
--- a/spring-cloud-starter-zipkin/pom.xml
+++ b/spring-cloud-starter-zipkin/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-sleuth</artifactId>
-		<version>2.1.2.RELEASE</version>
+		<version>2.1.2.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-zipkin</artifactId>