Merge branch '2.3.x' into 2.4.x

Closes gh-26696
pull/26775/head
Stephane Nicoll 4 years ago
commit 7f5adb7e9d

@ -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)

Loading…
Cancel
Save