Merge branch '2.4.x'

Closes gh-26697

Merge branch '2.4.x'
Closes gh-26697
b8b04301 · Stephane Nicoll · 5258c26f · 7f5adb7e · b8b04301
Commit b8b04301 authored May 28, 2021 by Stephane Nicoll
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

JerseySameManagementContextConfiguration.java .../web/jersey/JerseySameManagementContextConfiguration.java +1 -1

No files found.
--- 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)