Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix conflicting bean names between @EnableWebSecurity and @EnableWebSocketSecurity #16113

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Fix conflicting bean names between @EnableWebSecurity and @EnableWebSocketSecurity #16113

merged 2 commits into from
Nov 20, 2024

Conversation

ngocnhan-tran1996
Copy link
Contributor

I think we should change bean name or use @ConditionalOnMissingBean

Closes #16011

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Nov 17, 2024
@ngocnhan-tran1996 ngocnhan-tran1996 changed the title Change bean name for WebSocketObservationConfiguration Change bean name for WebSocketObservationConfiguration and ReactiveObservationConfiguration.java Nov 18, 2024
@jzheaux jzheaux self-assigned this Nov 20, 2024
@jzheaux jzheaux added in: config An issue in spring-security-config type: bug A general bug and removed status: waiting-for-triage An issue we've not yet triaged labels Nov 20, 2024
@jzheaux jzheaux added this to the 6.4.1 milestone Nov 20, 2024
@jzheaux
Copy link
Contributor

jzheaux commented Nov 20, 2024 •
edited
Loading

Thanks, @ngocnhan-tran1996. Will you please squash your commits and include the needed Closes message at the end? It should look like this:

Resolve Observation Bean Name Collisions

Closes gh-16011

Since this became time-sensitive as we decided to release the fix today, I went ahead and took care of these items. Thanks again, @ngocnhan-tran1996, for the fix!

@jzheaux jzheaux changed the title Change bean name for WebSocketObservationConfiguration and ReactiveObservationConfiguration.java Fix conflicting bean names between @EnableWebSecurity and @EnableWebSocketSecurity Nov 20, 2024
@jzheaux jzheaux merged commit b896a74 into spring-projects:main Nov 20, 2024
6 checks passed
@jzheaux jzheaux mentioned this pull request Nov 20, 2024
Closed
@ngocnhan-tran1996 ngocnhan-tran1996 deleted the gh-16011 branch November 23, 2024 04:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jzheaux jzheaux

Labels
in: config An issue in spring-security-config type: bug A general bug
Projects
None yet
Milestone
6.4.1
Development

Successfully merging this pull request may close these issues.

Fix conflicting bean names between @EnableWebSecurity and @EnableWebSocketSecurity
3 participants
@ngocnhan-tran1996 @jzheaux @spring-projects-issues