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

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-10-20 17:31:44 +02:00
parent fa1eceda8d e7097844dc
commit ef80772b92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6561,7 +6561,7 @@ for it. Your could define your `@SpringBootApplication` as follows:
---- ----
Because this class is the source configuration for the test, any slice test will actually Because this class is the source configuration for the test, any slice test will actually
attempt to start Spring Batch, which is definitely now what you want to do. A recommended attempt to start Spring Batch, which is definitely not what you want to do. A recommended
approach is to move that area-specific configuration to a separate `@Configuration` approach is to move that area-specific configuration to a separate `@Configuration`
class at the same level as your application. class at the same level as your application.
@ -6590,7 +6590,7 @@ application may look like this:
This effectively overrides the default component scan directive with the side effect of This effectively overrides the default component scan directive with the side effect of
scanning those two packages regardless of the slice that you've chosen. For instance a scanning those two packages regardless of the slice that you've chosen. For instance a
`@DataJpaTest` will all the sudden scan components and user configurations of your `@DataJpaTest` will all of a sudden scan components and user configurations of your
application. Again, moving the custom directive to a separate class is a good way to fix application. Again, moving the custom directive to a separate class is a good way to fix
this issue. this issue.