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.3.x' 

Closes gh-24404
This commit is contained in:
Phillip Webb 2020-12-08 12:13:02 -08:00
parent 93d83342d2 11f285bde5
commit cd5ff6e4af
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfigurationTests.java
View File

@ -21,7 +21,6 @@ import io.micrometer.core.instrument.MeterRegistry;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.autoconfigure.integration.IntegrationGraphEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.integration.IntegrationGraphEndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun; import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration; import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
@ -30,7 +29,7 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@link RabbitMetricsAutoConfiguration}. * Tests for {@link IntegrationMetricsAutoConfiguration}.
* *
* @author Artem Bilan * @author Artem Bilan
*/ */

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

@ -1171,7 +1171,7 @@ class WebMvcAutoConfigurationTests {
private int exceptionResolvers = 0; private int exceptionResolvers = 0;
@Bean @Bean
WebMvcRegistrations webMvcRegistrationsHandlerAdapter() { WebMvcRegistrations webMvcRegistrationsExceptionResolver() {
return new WebMvcRegistrations() { return new WebMvcRegistrations() {
@Override @Override

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

@ -6810,7 +6810,7 @@ For setting the timeout of the session you can use the configprop:spring.session
If that property is not set with a Servlet web appplication, the auto-configuration falls back to the value of configprop:server.servlet.session.timeout[]. If that property is not set with a Servlet web appplication, the auto-configuration falls back to the value of configprop:server.servlet.session.timeout[].
You can take control over Spring Session's configuration using `@Enable*HttpSession` (Servlet) or `@Enable@WebSession` (Reactive). You can take control over Spring Session's configuration using `@Enable*HttpSession` (Servlet) or `@Enable*WebSession` (Reactive).
This will cause the auto-configuration to back off. This will cause the auto-configuration to back off.
Spring Session can then be configured using the annotation's attributes rather than the previously described configuration properties. Spring Session can then be configured using the annotation's attributes rather than the previously described configuration properties.

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileWrapperTests.java
View File

@ -152,7 +152,7 @@ class JarFileWrapperTests {
} }
@Test @Test
void streamDelegatestoParent() { void streamDelegatesToParent() {
this.wrapper.stream(); this.wrapper.stream();
this.parent.verify(Call.STREAM); this.parent.verify(Call.STREAM);
} }