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.

Sign up for GitHub

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

Jump to bottom

Update dependency org.json:json to v20231013 #481

Merged
merged 1 commit into from
Nov 10, 2023
Merged

Update dependency org.json:json to v20231013 #481

merged 1 commit into from
Nov 10, 2023

Conversation

mend-for-github-com[bot]
Copy link
Contributor

This PR contains the following updates:

Package Type Update Change
org.json:json dependencies major 20230227 -> 20231013

By merging this PR, the issue #461 will be automatically resolved and closed:

Severity CVSS Score CVE
High High 7.5 CVE-2023-5072

Release Notes

douglascrockford/JSON-java

v20231013

Compare Source

Pull Request Description
#​793 Reverted #​761
#​792 update the docs for release 2023101
#​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

v20230618

Compare Source

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
  • If you want to rebase/retry this PR, check this box

@codecov Codecov
Copy link

codecov bot commented Nov 2, 2023

Codecov Report

Merging #481 (3873661) into main (c3e336f) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #481   +/-   ##
=========================================
  Coverage     84.37%   84.37%           
  Complexity      498      498           
=========================================
  Files            40       40           
  Lines          1491     1491           
  Branches        228      228           
=========================================
  Hits           1258     1258           
  Misses          133      133           
  Partials        100      100

@heemin32 heemin32 added the autocut Created by automated workflow label Nov 2, 2023
@martin-gaievski martin-gaievski added the backport 2.x Label will add auto workflow to backport PR to 2.x branch label Nov 10, 2023
@martin-gaievski martin-gaievski merged commit 00c5589 into main Nov 10, 2023
19 of 34 checks passed
@mend-for-github-com mend-for-github-com bot deleted the whitesource-remediate/org.json-json-20231013.x branch November 10, 2023 23:07
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 10, 2023
@mend-for-github-com @github-actions
Update dependency org.json:json to v20231013 (#481)
5304958 
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
(cherry picked from commit 00c5589)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Nov 10, 2023
Merged
martin-gaievski pushed a commit that referenced this pull request Nov 10, 2023
@opensearch-trigger-bot @mend-for-github-com
Update dependency org.json:json to v20231013 (#481) (#489)
2fe7ed2 
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
(cherry picked from commit 00c5589)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
krishy91 pushed a commit to krishy91/neural-search that referenced this pull request Dec 20, 2023
@mend-for-github-com
Update dependency org.json:json to v20231013 (opensearch-project#481)
5e13a47 
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Gopala-Krishna.Char <[email protected]>
krishy91 pushed a commit to krishy91/neural-search that referenced this pull request Jan 4, 2024
@mend-for-github-com
Update dependency org.json:json to v20231013 (opensearch-project#481)
975e302 
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Gopala-Krishna.Char <[email protected]>
zane-neo pushed a commit that referenced this pull request Mar 1, 2024
@krishy91 @peterzhuamazon
@mend-for-github-com @zhichao-aws @martin-gaievski @navneet1v
Handle case with nested list of objects (#477)
ea49d3c 
* Handle case with nested list of objects

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* fix validateEmbeddingsFieldValues Method

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* spotless formatting

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Onboard jenkins prod docker images on github actions (#483)

Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Update dependency org.json:json to v20231013 (#481)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479)

* [bug fix] Fix async actions are left in neural_sparse query (#438)

* add serialization and deserialization

Signed-off-by: zhichao-aws <[email protected]>

* hash, equals. + UT

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

* add test

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
(cherry picked from commit 51e6c00)

* rm max_token_score

Signed-off-by: zhichao-aws <[email protected]>

* add changelog

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed exception for case when Hybrid query being wrapped into bool query (#490)

* Adding null check for case when hybrid query wrapped into bool query

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed Hybrid query for cases when it's wrapped into other compound queries (#498)

* Fixed nested field case

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added the github action to copy the attached issues label to PR. (#504)

Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added support for jdk-21 (#500)

* Added support for jdk-21

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Add unit tests + small fixes

Signed-off-by: krishy91 <[email protected]>

* fix indentation

Signed-off-by: krishy91 <[email protected]>

* remove unused code + add 2nd level nesting test

Signed-off-by: krishy91 <[email protected]>

* add integration test for list of nested objects

Signed-off-by: krishy91 <[email protected]>

---------

Signed-off-by: Gopala-Krishna.Char <[email protected]>
Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: krishy91 <[email protected]>
Co-authored-by: Gopala-Krishna.Char <[email protected]>
Co-authored-by: Peter Zhu <[email protected]>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
Co-authored-by: Martin Gaievski <[email protected]>
Co-authored-by: Navneet Verma <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 1, 2024
@krishy91 @github-actions
Handle case with nested list of objects (#477)
7bf5b91 
* Handle case with nested list of objects

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* fix validateEmbeddingsFieldValues Method

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* spotless formatting

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Onboard jenkins prod docker images on github actions (#483)

Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Update dependency org.json:json to v20231013 (#481)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479)

* [bug fix] Fix async actions are left in neural_sparse query (#438)

* add serialization and deserialization

Signed-off-by: zhichao-aws <[email protected]>

* hash, equals. + UT

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

* add test

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
(cherry picked from commit 51e6c00)

* rm max_token_score

Signed-off-by: zhichao-aws <[email protected]>

* add changelog

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed exception for case when Hybrid query being wrapped into bool query (#490)

* Adding null check for case when hybrid query wrapped into bool query

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed Hybrid query for cases when it's wrapped into other compound queries (#498)

* Fixed nested field case

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added the github action to copy the attached issues label to PR. (#504)

Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added support for jdk-21 (#500)

* Added support for jdk-21

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Add unit tests + small fixes

Signed-off-by: krishy91 <[email protected]>

* fix indentation

Signed-off-by: krishy91 <[email protected]>

* remove unused code + add 2nd level nesting test

Signed-off-by: krishy91 <[email protected]>

* add integration test for list of nested objects

Signed-off-by: krishy91 <[email protected]>

---------

Signed-off-by: Gopala-Krishna.Char <[email protected]>
Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: krishy91 <[email protected]>
Co-authored-by: Gopala-Krishna.Char <[email protected]>
Co-authored-by: Peter Zhu <[email protected]>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
Co-authored-by: Martin Gaievski <[email protected]>
Co-authored-by: Navneet Verma <[email protected]>
(cherry picked from commit ea49d3c)
vibrantvarun pushed a commit that referenced this pull request Mar 5, 2024
@opensearch-trigger-bot @krishy91
Handle case with nested list of objects (#477) (#623)
d54fdce 
* Handle case with nested list of objects

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* fix validateEmbeddingsFieldValues Method

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* spotless formatting

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Onboard jenkins prod docker images on github actions (#483)

Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Update dependency org.json:json to v20231013 (#481)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (#438) (#479)

* [bug fix] Fix async actions are left in neural_sparse query (#438)

* add serialization and deserialization

Signed-off-by: zhichao-aws <[email protected]>

* hash, equals. + UT

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

* add test

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
(cherry picked from commit 51e6c00)

* rm max_token_score

Signed-off-by: zhichao-aws <[email protected]>

* add changelog

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed exception for case when Hybrid query being wrapped into bool query (#490)

* Adding null check for case when hybrid query wrapped into bool query

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed Hybrid query for cases when it's wrapped into other compound queries (#498)

* Fixed nested field case

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added the github action to copy the attached issues label to PR. (#504)

Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added support for jdk-21 (#500)

* Added support for jdk-21

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Add unit tests + small fixes

Signed-off-by: krishy91 <[email protected]>

* fix indentation

Signed-off-by: krishy91 <[email protected]>

* remove unused code + add 2nd level nesting test

Signed-off-by: krishy91 <[email protected]>

* add integration test for list of nested objects

Signed-off-by: krishy91 <[email protected]>

---------

Signed-off-by: Gopala-Krishna.Char <[email protected]>
Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: krishy91 <[email protected]>
Co-authored-by: Gopala-Krishna.Char <[email protected]>
Co-authored-by: Peter Zhu <[email protected]>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
Co-authored-by: Martin Gaievski <[email protected]>
Co-authored-by: Navneet Verma <[email protected]>
(cherry picked from commit ea49d3c)

Co-authored-by: Gopala-Krishna Char <[email protected]>
yuye-aws pushed a commit to yuye-aws/neural-search that referenced this pull request Mar 8, 2024
@krishy91 @peterzhuamazon
@mend-for-github-com @zhichao-aws @martin-gaievski @navneet1v @yuye-aws
Handle case with nested list of objects (opensearch-project#477)
a740264 
* Handle case with nested list of objects

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* fix validateEmbeddingsFieldValues Method

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* spotless formatting

Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Onboard jenkins prod docker images on github actions (opensearch-project#483)

Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Update dependency org.json:json to v20231013 (opensearch-project#481)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* [Backport main manually][bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438) (opensearch-project#479)

* [bug fix] Fix async actions are left in neural_sparse query (opensearch-project#438)

* add serialization and deserialization

Signed-off-by: zhichao-aws <[email protected]>

* hash, equals. + UT

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

* add test

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
(cherry picked from commit 51e6c00)

* rm max_token_score

Signed-off-by: zhichao-aws <[email protected]>

* add changelog

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed exception for case when Hybrid query being wrapped into bool query (opensearch-project#490)

* Adding null check for case when hybrid query wrapped into bool query

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Fixed Hybrid query for cases when it's wrapped into other compound queries (opensearch-project#498)

* Fixed nested field case

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added the github action to copy the attached issues label to PR. (opensearch-project#504)

Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Added support for jdk-21 (opensearch-project#500)

* Added support for jdk-21

Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Gopala-Krishna.Char <[email protected]>

* Add unit tests + small fixes

Signed-off-by: krishy91 <[email protected]>

* fix indentation

Signed-off-by: krishy91 <[email protected]>

* remove unused code + add 2nd level nesting test

Signed-off-by: krishy91 <[email protected]>

* add integration test for list of nested objects

Signed-off-by: krishy91 <[email protected]>

---------

Signed-off-by: Gopala-Krishna.Char <[email protected]>
Signed-off-by: Peter Zhu <[email protected]>
Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: Martin Gaievski <[email protected]>
Signed-off-by: Navneet Verma <[email protected]>
Signed-off-by: krishy91 <[email protected]>
Co-authored-by: Gopala-Krishna.Char <[email protected]>
Co-authored-by: Peter Zhu <[email protected]>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
Co-authored-by: Martin Gaievski <[email protected]>
Co-authored-by: Navneet Verma <[email protected]>
Signed-off-by: yuye-aws <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martin-gaievski martin-gaievski martin-gaievski approved these changes

@heemin32 heemin32 heemin32 approved these changes

@navneet1v navneet1v Awaiting requested review from navneet1v navneet1v is a code owner

@VijayanB VijayanB Awaiting requested review from VijayanB VijayanB is a code owner

@vamshin vamshin Awaiting requested review from vamshin vamshin is a code owner

@jmazanec15 jmazanec15 Awaiting requested review from jmazanec15 jmazanec15 is a code owner

@naveentatikonda naveentatikonda Awaiting requested review from naveentatikonda naveentatikonda is a code owner

@junqiu-lei junqiu-lei Awaiting requested review from junqiu-lei junqiu-lei is a code owner

@sean-zheng-amazon sean-zheng-amazon Awaiting requested review from sean-zheng-amazon sean-zheng-amazon is a code owner

@model-collapse model-collapse Awaiting requested review from model-collapse model-collapse is a code owner

@zane-neo zane-neo Awaiting requested review from zane-neo zane-neo is a code owner

@ylwu-amzn ylwu-amzn Awaiting requested review from ylwu-amzn

@jngz-es jngz-es Awaiting requested review from jngz-es

Assignees
No one assigned
Labels
autocut Created by automated workflow backport 2.x Label will add auto workflow to backport PR to 2.x branch security fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@heemin32 @martin-gaievski