Commit b8b04301 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.4.x'

Closes gh-26697
parents 5258c26f 7f5adb7e
......@@ -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)
......
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