root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-07-27 00:47:09 +02:00
parent db1d3fa282 85cffd1ab5
commit 4b3c40ff10
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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")

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -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>