Merge branch '2.3.x' into 2.4.x

Closes gh-26696
4 years ago · 7f5adb7e9d
parent 454d72d9b2 67fe60ba8a
commit 7f5adb7e9d
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfiguration.java
@ -57,7 +57,7 @@ public class JerseySameManagementContextConfiguration {
 	@Configuration(proxyBeanMethods = false)
 	@Import(JerseyManagementContextConfiguration.class)
 	@ConditionalOnMissingBean(ResourceConfig.class)
-	class JerseyInfrastructureConfiguration {
+	static class JerseyInfrastructureConfiguration {

 		@Bean
 		@ConditionalOnMissingBean(JerseyApplicationPath.class)