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

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-09-24 17:12:46 +02:00
parent c999704b10 b53f108d07
commit dc5254c333
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-dependencies/pom.xml
View File

@ -1365,6 +1365,11 @@
<artifactId>tomcat-annotations-api</artifactId> <artifactId>tomcat-annotations-api</artifactId>
<version>${tomcat.version}</version> <version>${tomcat.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat</groupId> <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId> <artifactId>tomcat-jdbc</artifactId>

2
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -980,7 +980,7 @@ does not inject other beans from the context. Having said that, The
`@EnableConfigurationProperties` annotation is _also_ automatically applied to your project `@EnableConfigurationProperties` annotation is _also_ automatically applied to your project
so that any _existing_ bean annotated with `@ConfigurationProperties` will be configured so that any _existing_ bean annotated with `@ConfigurationProperties` will be configured
from the `Environment`. You could shortcut `MyConfiguration` above by making sure from the `Environment`. You could shortcut `MyConfiguration` above by making sure
`FooProperties` is a already a bean: `FooProperties` is already a bean:
[source,java,indent=0] [source,java,indent=0]
---- ----