From 37f1146c3122e59bbfccef36788dd333fa69cfc1 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 27 Jul 2018 00:45:31 +0200
Subject: [PATCH 1/2] Fix formatting

---
 .../boot/autoconfigure/condition/ConditionalOnProperty.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
index 1923e348f4b..a40d9093955 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
@@ -75,7 +75,8 @@ import org.springframework.core.env.Environment;
  * <p>
  * This condition cannot be reliably used for matching collection properties. For example,
  * in the following configuration, the condition matches if {@code spring.example.values}
- * is present in the {@link Environment} but does not match if {@code spring.example.values[0]} is present.
+ * is present in the {@link Environment} but does not match if
+ * {@code spring.example.values[0]} is present.
  *
  * <pre class="code">
  * &#064;ConditionalOnProperty(prefix = "spring", name = "example.values")

From 85cffd1ab50a9dc8bc3a90f72c7c6f4d69c4b10d Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 27 Jul 2018 00:46:19 +0200
Subject: [PATCH 2/2] Upgrade to Spring Web Services 3.0.3.RELEASE

Closes gh-13912
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index faf1306d6f1..45a816cfdd9 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -165,7 +165,7 @@
 		<spring-retry.version>1.2.2.RELEASE</spring-retry.version>
 		<spring-security.version>5.0.7.BUILD-SNAPSHOT</spring-security.version>
 		<spring-session-bom.version>Apple-BUILD-SNAPSHOT</spring-session-bom.version>
-		<spring-ws.version>3.0.2.RELEASE</spring-ws.version>
+		<spring-ws.version>3.0.3.RELEASE</spring-ws.version>
 		<sqlite-jdbc.version>3.21.0.1</sqlite-jdbc.version>
 		<statsd-client.version>3.1.0</statsd-client.version>
 		<sun-mail.version>${javax-mail.version}</sun-mail.version>