Skip to content

Commit

Permalink
Merge branch '2.3.x' into 2.4.x
Browse files Browse the repository at this point in the history
Closes gh-26696
  • Loading branch information
snicoll committed May 28, 2021
2 parents 454d72d + 67fe60b commit 7f5adb7
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -57,7 +57,7 @@ ResourceConfigCustomizer managementResourceConfigCustomizerAdapter(
@Configuration(proxyBeanMethods = false)
@Import(JerseyManagementContextConfiguration.class)
@ConditionalOnMissingBean(ResourceConfig.class)
class JerseyInfrastructureConfiguration {
static class JerseyInfrastructureConfiguration {

@Bean
@ConditionalOnMissingBean(JerseyApplicationPath.class)
Expand Down

0 comments on commit 7f5adb7

Please sign in to comment.