Switch CAS to use 6.5.x / Spring Boot 2.6.x #296
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
# Conflicts: # pom.xml
ilgrosso
reviewed
Nov 15, 2021
# Conflicts: # pom.xml # wa/starter/src/main/java/org/apache/syncope/wa/starter/config/SyncopeWAConfiguration.java
mmoayyed
changed the title
ilgrosso
requested changes
Dec 9, 2021
Member
ilgrosso
left a comment
ilgrosso
left a comment
There was a problem hiding this comment.
The PR looks good to me.
I think it is also good to update spring-cloud-contract-wiremock to ${spring-cloud-gateway.version} by restoring https://github.com/apache/syncope/blob/master/pom.xml#L1891-L1893
Also: do you have idea why GH is displaying changes from other commits into this PR's changes?
Contributor
Author
|
Sure. I updated the PR. I think GH might be confused after the branch was merged with master. This branch was sync'd with master once, but it seems like GH does not recognize the changes as those that might already be merged with master. |
ilgrosso
approved these changes
Dec 9, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Uh oh!
There was an error while loading. Please reload this page.