Merge branch '2.1.x'

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/src/test/java/smoketest/jetty/jsp/SampleWebJspApplicationTests.java

@@ -17,7 +17,7 @@
 package smoketest.jetty.jsp;
 
 import org.eclipse.jetty.server.handler.ContextHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;