Fix main branch issues #641
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
plugins for GPG signing
library version update to fix security vulnerability
Updated jackson-databind version
Updated versions for hotfix release.
Fix Issue 572
update regional endpoints
version updates for release
Support new CIAM authority
updated org-json version to resolve Dependabot alert
add refresh_in logic
* Better error handling for redirect URIs * Update oauth2-oidc-sdk dependency * Address review comments Co-authored-by: Bogdan Gavril <[email protected]> --------- Co-authored-by: Bogdan Gavril <[email protected]>
* Version updates for 1.13.8 release * Update changelog.txt
Point to MSAL Java reference docs onboarded to Microsoft Learn
# Conflicts: # README.md # msal4j-sdk/changelog.txt # msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/ClientCredentialsIT.java # msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/TestConstants.java # msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AadInstanceDiscoveryProvider.java # msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/AbstractClientApplicationBase.java # msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/TokenRequestExecutor.java # msal4j-sdk/src/samples/msal-b2c-web-sample/pom.xml # msal4j-sdk/src/samples/msal-obo-sample/pom.xml # msal4j-sdk/src/samples/msal-web-sample/pom.xml # pom.xml
…ation-library-for-java into avdunn/fix-branch-issues # Conflicts: # README.md # changelog.txt # msal4j-brokers/pom.xml # msal4j-sdk/README.md # msal4j-sdk/bnd.bnd # msal4j-sdk/pom.xml # src/integrationtest/java/com.microsoft.aad.msal4j/InstanceDiscoveryTest.java # src/integrationtest/java/com.microsoft.aad.msal4j/InvalidAuthorityIT.java # src/main/java/com/microsoft/aad/msal4j/CIAMAuthority.java # src/samples/msal-b2c-web-sample/pom.xml # src/samples/msal-obo-sample/pom.xml # src/samples/msal-web-sample/pom.xml
siddhijain
approved these changes
May 3, 2023
Avery-Dunn
added a commit
that referenced
this pull request
May 4, 2023
This reverts commit a08b9be.
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.
The main branch was in a weird state between versions 1.13.1 and 1.13.2, and had gotten out of sync with the dev branch
This PR brings it up to date with the current dev branch and resolves various merge conflicts, so hopefully the next dev->main merge goes smoothly