Merge 5.x into main, resolve conflicts #694
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 618bdb8)
Addresses a number of CVEs that affect versions from 2.9.0 through 2.9.7, inclusive. (cherry picked from commit 13c786d)
(cherry picked from commit 7865c10)
(cherry picked from commit 46ef9bd)
(cherry picked from commit b3ef95b)
Fix a broken reference to a method, add <source>8</source> to fix build on Java 11, replace package.html by package-info.java. (cherry picked from commit 7abd20c)
(cherry picked from commit 434ee8b)
(cherry picked from commit fe75196)
(cherry picked from commit 74a7b39)
(cherry picked from commit a24af9c)
(cherry picked from commit 2cb0267)
(cherry picked from commit 2f684a8)
(cherry picked from commit a810eba)
(cherry picked from commit 8c8bdd3)
(cherry picked from commit 9658f44)
(cherry picked from commit cce132b)
Due to changes in [1] argument mismatch that involves the exclusive property can report a different channel exception (406 LOCKED). Since it has nothing to do with dead-lettering, switching to cleaning up queues manually and relying on their non-durability e.g. between CI runs is sufficient. Spotted by @acogoluegnes. 1. rabbitmq/rabbitmq-server@bd46898 (cherry picked from commit dae7b13)
(cherry picked from commit 8fa6760)
(cherry picked from commit b7fe520)
(cherry picked from commit e3ae28c)
(cherry picked from commit cc7c867)
(cherry picked from commit 4dde118)
(cherry picked from commit 39fe122)
(cherry picked from commit e32bcbb)
(cherry picked from commit 83d5fc3)
Allow changing queue names during recovery
Author: Michael Dent <[email protected]>
Conflicts: src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
michaelklishin
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges
5.x.x-stableintomainto get #692, #693 but also to reduce the delta to the extent possible.