Forward merge 5.x.x into main - #1355
Merged
Kehrlann merged 13 commits intoApr 28, 2026
Merged
Kehrlann merged 13 commits into
Kehrlann merged 13 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
- Fixes cloudfoundrygh-1335 Signed-off-by: Daniel Garnier-Moiroux <daniel.garnier-moiroux@broadcom.com>
The test-service-broker.jar (Spring Boot 1.5.16 / Spring Framework 4.3.19) uses CGLIB proxying which requires reflective access to java.lang.ClassLoader.defineClass(). JDK 17's module system blocks this, causing the app to crash on startup with InaccessibleObjectException and all ApplicationsTest methods to fail with DelayTimeoutException during serviceBrokerId bean creation.
Some UAA seem to send a slightly different reply. This accepts and tests for both.
Tests login endpoint instead, which should usually be present
PR cloudfoundry#1348 changed the null-recent behavior from Doppler streaming to Log Cache. This restores the original default so null behaves like false (streaming), matching the prior logs(LogsRequest) contract.
This reverts commit 082ff90.
Kehrlann
self-requested a review
April 28, 2026 09:01
Kehrlann
approved these changes
Apr 28, 2026
Kehrlann
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
This is perfect, thanks!
Indeed, since I cherry-picked the Fix client_credentials on 5.x.x from main, the commit appears in both branches of the graph, but git can do the merge without making any change. I tried a local merge and it went fine.
I also did further forward-ports of 5.x.x into main and it goes smoothly.
Sorry, something went wrong.
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
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.
Brings all changes from 5.x.x into main. Reverts version bump commit.
Compared to #1354 the "Fix client credentials grant token invalidation" commit will appear twice in the history. Also, the diff on github shows changes coming from this commit, but git should be able to sort this out.