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.

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

Bump org.json:json from 20230227 to 20231013 in /msal4j-sdk/src/samples/msal-b2c-web-sample #739

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 26, 2023

Bumps org.json:json from 20230227 to 20231013.

Release notes

Sourced from org.json:json's releases.

20231013

Pull Request Description
#793 Reverted #761
#792 update the docs for release 20231013
#783 optLong vs getLong inconsistencies
#782 Fix XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig() for Windows
#779 add validity check for JSONObject constructors
#778 Fix XMLTest.testIndentComplicatedJsonObjectWithArrayAndWithConfig() for Windows
#776 Update [JUnit to version 4.13.2
#774 Removing unneeded synchronization
#773 Add optJSONArray method to JSONObject with a default value
#772 Disallow nested objects and arrays as keys in objects
#779 Unit test cleanup
#769 Addressed Java 17 compile warnings
#764 Update CodeQL action version
#761 Add module-info
#759 JSON parsing should detect embedded 
#753 Updated new object methods
#752 Fixes possible unit test bug when compiling/testing on Windows

20230618

Pull Request Description
#749 Prep for release 20230618
#740 Fixed Flaky Tests Caused by JSON permutations
#734 Fixed Flaky Tests Caused by JSON permutations
#733 JSONTokener implemented java.io.Closeable
#731 Removing commented out code in JSONObject optDouble()
#729 Refactor ParserConfiguration class hierarchy
Changelog

Sourced from org.json:json's changelog.

20231013 First release with minimum Java version 1.8. Recent commits, including fixes for CVE-2023-5072.

20230618 Final release with Java 1.6 compatibility. Future releases will require Java 1.8 or greater.

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    You can disable automated security fix PRs for this repo from the Security Alerts page.

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added the Dependencies Pull requests that update a dependency file label Oct 26, 2023
@Avery-Dunn Avery-Dunn merged commit 7288306 into dev Nov 7, 2023
2 checks passed
@dependabot dependabot bot deleted the dependabot/maven/msal4j-sdk/src/samples/msal-b2c-web-sample/org.json-json-20231013 branch November 7, 2023 15:36
Avery-Dunn added a commit that referenced this pull request Mar 25, 2024
* Move changelog to root

* Update issue templates (#707)

* Re-add lombok source line (#705)

* Version changes for release 1.13.11 (#714)

* Update bug report

* Delete .github/ISSUE_TEMPLATE/bug_report.md

* Update bug_report.yaml

* Create FeatureRequest.yaml

* Update FeatureRequest.yaml

* Set default throttling time to 5 sec (#721)

Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* MSAL Java/MSALRuntime integration (#590)

* Add IBroker implementation for MSALRuntime

* Remove dll used during testing

* Integrate broker steps to relevant flows in PublicClientApplication

* Add logic to cancel MsalRuntimeFutures

* Expand javadocs and exception handling

* Address code review comments

* Simplify future chaining, address code review comments

* Reorganize future chaining, fix testing issues

* Adjust how broker availability is checked

* Create automated test

* Adjust startup logic

* Correct version number for interop

* Correct broker versioning

* Move broker tests to MSAL Java package

* Remove usage of msal4j-brokers from msal4j

* Add missing SLFJ dependency

* Use newest msal4j

* Bump javamsalruntime version number

* Version changes for 1.14.0-beta release (#589)

* Add missing pom info needed by sonatype

* APIs for toggling MSALRuntime's logging (#608)

* Add APIs for toggling MSALRuntime's logging systems

* Rename logging methods to be more clear

* Add support for POP tokens to MSAL Java and MSAL Java Brokers (#639)

* Version changes for 1.14.0-beta release

* regional endpoint change to always use login.microsoft.com

* Add support for both current and legacy B2C authority formats (#594)

* Add support for both current and legacy B2C authority formats

* Fix B2C format test

* add 2 seconds timeout while calling IMDS

* Fix failing tests

* Fix failing tests

* delete commented out code

* Use the dedicated admin consent endpoint instead of a query parameter (#599)

* updated versions for release

* update condition to throw exception

* added test for invalid authority

* Add tests for a CIAM user and reduce test code duplication (#603)

* Add tests for a CIAM user and reduce code duplication in several test files

* Revert changed method name

* Attempt to resolve credscan flag

* Resolve credscan issues

* Address code review comments

* Use default scope

* expose extraQueryParameters

* expose extraQueryParameters

* ExtraQueryParameters tests

* retrigger the tests

* Updated an existing test case to check added parameters

* Replace exception with warning

* version updates for release

* update json-smart version

* Updated json-smart version 

Updated json-smart version to a 'bug-free' version

* version updates for release

* Initial commit

* add CIAM authority file

* revert authority validation changes

* Fix failing tests

* Fix failing tests

* remove commented out line

* remove unnecessary code

* update exception message for device code flow

* add refresh_in logic

* resolve build issues + address PR comments

* update tests

* updated org-json version to resolve Dependabot alert

* Better redirect URI error handling and dependency upgrade (#633)

* Better error handling for redirect URIs

* Update oauth2-oidc-sdk dependency

* Address review comments

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

---------

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* Version updates for 1.13.8 release (#634)

* Version updates for 1.13.8 release

* Update changelog.txt

* Point to MSAL Java reference docs onboarded to Microsoft Learn

* Add support for POP tokens to MSAL Java and MSAL Java Brokers

* Send extraQueryParameters to interop's AuthParameters

* Avoid exposing new PopParameters class, change API to match design doc

* Update msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/InteractiveRequestParameters.java

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* Update msal4j-sdk/src/main/java/com/microsoft/aad/msal4j/InteractiveRequestParameters.java

Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>

* Update change log URl in README.md (#649)

Replaced broken link in change log reference with msal4j-sdk/changelog.txt

* Issue 447

* Feedback incorporation

* enum for os type

* Use enum for HTTP methods

* Add broker tests, address PR review comments

* Improve PoP tests

* Address code review comments

* Version updates

* Re-add extraQueryParameters support

---------

Co-authored-by: siddhijain <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>

* Fix silent issue

* Ensure correlation ID is never null

* Broker fixes and feedback (#733)

* Delete codeql.yml

* Test framework update (#672)

* Initial working tests

* Remove CIAM extra query parameter

* Fix failing tests

* Remove duplicate unit tests

* Remove duplicate unit tests

* Update tests with mocking to use Mockito

* Remove testng and powermock, add junit and mockito

* Remove AbstractMsalTests and PowerMockTestCase

* Fix mistaken null check

* Properly scope dependency

* Update CIAM tests (#673)

* Bump guava from 31.1-jre to 32.0.0-jre in /msal4j-sdk (#671)

Bumps [guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Delete contributing.md (#667)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Create Contributing.md (#668)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Version changes for 1.13.9 (#674)

* Add space between command and arguments when executing linux command to open browser. Refs #682 (#683)

Co-authored-by: Ric Emery <remery@denmartech.com>

* Assorted fixes (#684)

* Remove default timeouts and improve exception messages

* Fix NPE for on-prem ADFS scenario

* Log MSAL message but re-throw exception

* Update vulnerable test dependency

* Issue-679: Fix for Account Cache; .contains() was not possible and you had to iterate through all elements as workaround. (#681)

* Version changes for 1.13.10 (#685)

* Move changelog

* Move changelog to root

* Update issue templates (#707)

* Re-add lombok source line (#705)

* Version changes for release 1.13.11 (#714)

* Update bug report

* Delete .github/ISSUE_TEMPLATE/bug_report.md

* Update bug_report.yaml

* Create FeatureRequest.yaml

* Update FeatureRequest.yaml

* Set default throttling time to 5 sec (#721)

Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* Ensure correlation ID is never null

* Rename MsalRuntimeBroker and add builder pattern for better API consistency

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* Version changes for msal4j-brokers 1.0.3-beta and msal4j 1.14.3-beta (#734)

* Ensure correlation ID is never null

* Version changes for msal4j-brokers 1.0.3-beta and msal4j 1.14.3-beta

* Ensure that builder values for supported OS's are used

* Release 1.14.0/1.0.0 version changes (#736)

* Delete codeql.yml

* Test framework update (#672)

* Initial working tests

* Remove CIAM extra query parameter

* Fix failing tests

* Remove duplicate unit tests

* Remove duplicate unit tests

* Update tests with mocking to use Mockito

* Remove testng and powermock, add junit and mockito

* Remove AbstractMsalTests and PowerMockTestCase

* Fix mistaken null check

* Properly scope dependency

* Update CIAM tests (#673)

* Bump guava from 31.1-jre to 32.0.0-jre in /msal4j-sdk (#671)

Bumps [guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Delete contributing.md (#667)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Create Contributing.md (#668)

Co-authored-by: Avery-Dunn <avdunn@microsoft.com>

* Version changes for 1.13.9 (#674)

* Add space between command and arguments when executing linux command to open browser. Refs #682 (#683)

Co-authored-by: Ric Emery <remery@denmartech.com>

* Assorted fixes (#684)

* Remove default timeouts and improve exception messages

* Fix NPE for on-prem ADFS scenario

* Log MSAL message but re-throw exception

* Update vulnerable test dependency

* Issue-679: Fix for Account Cache; .contains() was not possible and you had to iterate through all elements as workaround. (#681)

* Version changes for 1.13.10 (#685)

* Move changelog

* Move changelog to root

* Update issue templates (#707)

* Re-add lombok source line (#705)

* Version changes for release 1.13.11 (#714)

* Update bug report

* Delete .github/ISSUE_TEMPLATE/bug_report.md

* Update bug_report.yaml

* Create FeatureRequest.yaml

* Update FeatureRequest.yaml

* Set default throttling time to 5 sec (#721)

Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* Version changes for 1.14.0 msal4j and 1.0.0 msal4j-brokers

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: siddhijain <siddhijain@microsoft.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>

* Version changes for 1.14.0 msal4j

* Bump org.json:json in /msal4j-sdk/src/samples/msal-obo-sample (#740)

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump org.json:json in /msal4j-sdk/src/samples/msal-b2c-web-sample (#739)

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump org.json:json in /msal4j-sdk/src/samples/msal-web-sample (#737)

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Version updates for 1.14.4-beta release

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bogdan Gavril <bogavril@microsoft.com>
Co-authored-by: akulyakhtin <akulyakhtin@gmail.com>
Co-authored-by: Kulyakhtin, Alexander (Ext) <alexander.kulyakhtin_ext@novartis.com>
Co-authored-by: siddhijain <siddhijain@microsoft.com>
Co-authored-by: Dickson Mwendia <64727760+Dickson-Mwendia@users.noreply.github.com>
Co-authored-by: Tamas Csizmadia <tamas@me.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ric Emery <ric.emery@gmail.com>
Co-authored-by: Ric Emery <remery@denmartech.com>
Co-authored-by: Maximilian Pfeffer <admin@maxpfeffer.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant