Merge branch '2.0.x'

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java

@@ -75,7 +75,8 @@
  * <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")

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -166,7 +166,7 @@
 		<spring-retry.version>1.2.2.RELEASE</spring-retry.version>
 		<spring-security.version>5.1.0.BUILD-SNAPSHOT</spring-security.version>
 		<spring-session-bom.version>Apple-SR3</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.23.1</sqlite-jdbc.version>
 		<statsd-client.version>3.1.0</statsd-client.version>
 		<sun-mail.version>${javax-mail.version}</sun-mail.version>