Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

Browse Source 
See gh-25450
This commit is contained in:
Andy Wilkinson
2021-02-26 15:46:52 +00:00
parent 54ba9e6ddf 12d3b15244
commit c35a4cc283
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/AbstractJerseyManagementPortTests.java
View File

@@ -43,8 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* *
* @author Madhura Bhave * @author Madhura Bhave
*/ */
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "management.server.port=0")
properties = { "management.server.port=0", "debug=true" })
@Import(ResourceConfigConfiguration.class) @Import(ResourceConfigConfiguration.class)
class AbstractJerseyManagementPortTests { class AbstractJerseyManagementPortTests {

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterApplicationTests.java
View File

@@ -23,7 +23,7 @@ import org.springframework.test.context.TestPropertySource;
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@TestPropertySource(properties = "spring.jersey.type=filter") @TestPropertySource(properties = { "spring.jersey.type=filter", "server.servlet.register-default-servlet=true" })
class JerseyFilterApplicationTests extends AbstractJerseyApplicationTests { class JerseyFilterApplicationTests extends AbstractJerseyApplicationTests {
} }

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jersey/src/test/java/smoketest/jersey/JerseyFilterManagementPortTests.java
View File

@@ -24,7 +24,7 @@ import org.springframework.test.context.TestPropertySource;
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
@TestPropertySource(properties = "spring.jersey.type=filter") @TestPropertySource(properties = { "spring.jersey.type=filter", "server.servlet.register-default-servlet=true" })
public class JerseyFilterManagementPortTests extends AbstractJerseyManagementPortTests { public class JerseyFilterManagementPortTests extends AbstractJerseyManagementPortTests {
} }