From 83f888ad24197d6865300a26f5c0942cceffb91b Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 25 Feb 2019 16:16:10 +0100
Subject: [PATCH] Updated sc-build

---
 pom.xml                                       |  4 +-
 .../web/SkipPatternProviderConfigTest.java    | 51 ++++++++++++-------
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2590a83be..b41f41dd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.3.BUILD-SNAPSHOT</version>
+		<version>2.1.4.BUILD-SNAPSHOT</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -252,7 +252,7 @@
 		<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.3.BUILD-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-build.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<spring-cloud-commons.version>2.1.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-gateway.version>2.1.1.BUILD-SNAPSHOT</spring-cloud-gateway.version>
 		<spring-cloud-stream.version>Fishtown.BUILD-SNAPSHOT</spring-cloud-stream.version>
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 abf8361f2..71ef0653d 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
@@ -107,7 +107,8 @@ public class SkipPatternProviderConfigTest {
 		};
 
 		Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsSamePort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(pattern).isNotEmpty();
@@ -129,7 +130,8 @@ public class SkipPatternProviderConfigTest {
 		};
 
 		Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsSamePort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(pattern).isNotEmpty();
@@ -151,7 +153,8 @@ public class SkipPatternProviderConfigTest {
 		};
 
 		Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsSamePort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(pattern).isNotEmpty();
@@ -173,7 +176,8 @@ public class SkipPatternProviderConfigTest {
 		};
 
 		Optional<Pattern> pattern = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsSamePort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(pattern).isNotEmpty();
@@ -195,19 +199,22 @@ public class SkipPatternProviderConfigTest {
 		};
 
 		Optional<Pattern> patternDifferentPort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsDifferentPort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsDifferentPort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(patternDifferentPort).isNotEmpty();
-		then(patternDifferentPort.get().pattern()).isEqualTo("/(info|info/.*|health|health/.*)");
-		
+		then(patternDifferentPort.get().pattern())
+				.isEqualTo("/(info|info/.*|health|health/.*)");
+
 		Optional<Pattern> patternSamePort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsSamePort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
-		
+
 		then(patternSamePort).isNotEmpty();
 		then(patternSamePort.get().pattern())
-		   		.isEqualTo("foo/(info|info/.*|health|health/.*)");
+				.isEqualTo("foo/(info|info/.*|health|health/.*)");
 	}
 
 	@Test
@@ -225,17 +232,19 @@ public class SkipPatternProviderConfigTest {
 		};
 
 		Optional<Pattern> patternDifferentPort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsDifferentPort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsDifferentPort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(patternDifferentPort).isNotEmpty();
 		then(patternDifferentPort.get().pattern())
 				.isEqualTo("/mgt/(info|info/.*|health|health/.*)");
-		
+
 		Optional<Pattern> patternSamePort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsSamePort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
-		
+
 		then(patternSamePort).isNotEmpty();
 		then(patternSamePort.get().pattern())
 				.isEqualTo("foo/mgt/(info|info/.*|health|health/.*)");
@@ -256,18 +265,22 @@ public class SkipPatternProviderConfigTest {
 		};
 
 		Optional<Pattern> patternDifferentPort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsDifferentPort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsDifferentPort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(patternDifferentPort).isNotEmpty();
-		then(patternDifferentPort.get().pattern()).isEqualTo("/actuator/(info|info/.*|health|health/.*)");
-		
+		then(patternDifferentPort.get().pattern())
+				.isEqualTo("/actuator/(info|info/.*|health|health/.*)");
+
 		Optional<Pattern> patternSamePort = new TraceWebAutoConfiguration.ActuatorSkipPatternProviderConfig()
-				.skipPatternForActuatorEndpointsSamePort(properties, webEndpointProperties, endpointsSupplier)
+				.skipPatternForActuatorEndpointsSamePort(properties,
+						webEndpointProperties, endpointsSupplier)
 				.skipPattern();
 
 		then(patternSamePort).isNotEmpty();
-		then(patternSamePort.get().pattern()).isEqualTo("/foo/actuator/(info|info/.*|health|health/.*)");
+		then(patternSamePort.get().pattern())
+				.isEqualTo("/foo/actuator/(info|info/.*|health|health/.*)");
 	}
 
 	@Test