Skip to content

S
spring-boot
Commit 7f5adb7e authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.3.x' into 2.4.x 

Closes gh-26696
parents 454d72d9 67fe60ba
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/jersey/JerseySameManagementContextConfiguration.java
View file @ 7f5adb7e
...@@ -57,7 +57,7 @@ public class JerseySameManagementContextConfiguration { ...@@ -57,7 +57,7 @@ public class JerseySameManagementContextConfiguration {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@Import(JerseyManagementContextConfiguration.class) @Import(JerseyManagementContextConfiguration.class)
@ConditionalOnMissingBean(ResourceConfig.class) @ConditionalOnMissingBean(ResourceConfig.class)
class JerseyInfrastructureConfiguration { static class JerseyInfrastructureConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(JerseyApplicationPath.class) @ConditionalOnMissingBean(JerseyApplicationPath.class)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment