Skip to content

Commit 12d3b15

Browse files
committed
Ensure that Jersey's filter has a servlet at the end of its chain
See gh-25449
1 parent cb600f1 commit 12d3b15

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
*
4444
* @author Madhura Bhave
4545
*/
46-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
47-
properties = { "management.server.port=0", "debug=true" })
46+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "management.server.port=0")
4847
@Import(ResourceConfigConfiguration.class)
4948
class AbstractJerseyManagementPortTests {
5049

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*
2424
* @author Andy Wilkinson
2525
*/
26-
@TestPropertySource(properties = "spring.jersey.type=filter")
26+
@TestPropertySource(properties = { "spring.jersey.type=filter", "server.servlet.register-default-servlet=true" })
2727
class JerseyFilterApplicationTests extends AbstractJerseyApplicationTests {
2828

2929
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
* @author Andy Wilkinson
2626
*/
27-
@TestPropertySource(properties = "spring.jersey.type=filter")
27+
@TestPropertySource(properties = { "spring.jersey.type=filter", "server.servlet.register-default-servlet=true" })
2828
public class JerseyFilterManagementPortTests extends AbstractJerseyManagementPortTests {
2929

3030
}

0 commit comments

Comments
 (0)