Merge branch '2.1.x'

2019-07-24 16:27:49 -07:00
parent 9bd1187f40 f13f96d705
commit 4a309ed491
2 changed files with 2 additions and 2 deletions
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/com/example/JettyServerCustomizerConfig.java
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/com/example/JettyServerCustomizerConfig.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
 *
 * @author Madhura Bhave
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class JettyServerCustomizerConfig {

 	@Bean