Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll 2018-10-16 11:38:39 +02:00
commit 39f8b685df
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/SchedulerFactoryBeanCustomizer.java
View File

@ -26,7 +26,7 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
* configuration. * configuration.
* <p> * <p>
* For customization of the {@link DataSource} used by Quartz, use of * For customization of the {@link DataSource} used by Quartz, use of
* {@link QuartzDataSource @QuartDataSource} is preferred. It will ensure consistent * {@link QuartzDataSource @QuartzDataSource} is preferred. It will ensure consistent
* customization of both the {@link SchedulerFactoryBean} and the * customization of both the {@link SchedulerFactoryBean} and the
* {@link QuartzDataSourceInitializer}. * {@link QuartzDataSourceInitializer}.
* *

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

@ -2000,7 +2000,7 @@ Jackson is the preferred and default library.
[[boot-features-json-jackson]] [[boot-features-json-jackson]]
=== Jackson === Jackson
Auto-configuration for Jackson is provided and Jackson is part of Auto-configuration for Jackson is provided and Jackson is part of
`spring-boot-starer-json`. When Jackson is on the classpath an `ObjectMapper` `spring-boot-starter-json`. When Jackson is on the classpath an `ObjectMapper`
bean is automatically configured. Several configuration properties are provided for bean is automatically configured. Several configuration properties are provided for
<<howto.adoc#howto-customize-the-jackson-objectmapper,customizing the configuration of the <<howto.adoc#howto-customize-the-jackson-objectmapper,customizing the configuration of the
`ObjectMapper`>>. `ObjectMapper`>>.

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestServletFilterRegistrationDisabledIntegrationTests.java
View File

@ -43,7 +43,7 @@ public class WebMvcTestServletFilterRegistrationDisabledIntegrationTests {
private MockMvc mvc; private MockMvc mvc;
@Test @Test
public void shouldApplyFilter() throws Exception { public void shouldNotApplyFilter() throws Exception {
this.mvc.perform(get("/one")).andExpect(header().string("x-test", (String) null)); this.mvc.perform(get("/one")).andExpect(header().string("x-test", (String) null));
} }