Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Madhura Bhave 2019-07-24 16:27:49 -07:00
commit 4a309ed491
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/com/example/JettyServerCustomizerConfig.java
View File

@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
*
* @author Madhura Bhave
*/
@Configuration
@Configuration(proxyBeanMethods = false)
public class JettyServerCustomizerConfig {
@Bean

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

@ -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;