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 json version to address CVE-2023-5072 #1551

Merged
merged 1 commit into from
Oct 25, 2023

Conversation

rbhavna
Copy link
Collaborator

@rbhavna rbhavna commented Oct 25, 2023

Description

Bump json version to address CVE-2023-5072

Issues Resolved

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@rbhavna rbhavna temporarily deployed to ml-commons-cicd-env October 25, 2023 18:08 — with GitHub Actions Inactive
@rbhavna rbhavna temporarily deployed to ml-commons-cicd-env October 25, 2023 18:08 — with GitHub Actions Inactive
@rbhavna rbhavna temporarily deployed to ml-commons-cicd-env October 25, 2023 18:08 — with GitHub Actions Inactive
@rbhavna rbhavna temporarily deployed to ml-commons-cicd-env October 25, 2023 18:08 — with GitHub Actions Inactive
@rbhavna rbhavna had a problem deploying to ml-commons-cicd-env October 25, 2023 18:08 — with GitHub Actions Failure
@codecov
Copy link

codecov bot commented Oct 25, 2023

Codecov Report

Merging #1551 (87a0b01) into main (5d9324c) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1551   +/-   ##
=========================================
  Coverage     78.39%   78.39%           
  Complexity     2378     2378           
=========================================
  Files           195      195           
  Lines          9594     9594           
  Branches        964      964           
=========================================
  Hits           7521     7521           
  Misses         1636     1636           
  Partials        437      437           
Flag Coverage Δ
ml-commons 78.39% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@rbhavna rbhavna merged commit 8c3e453 into opensearch-project:main Oct 25, 2023
9 of 11 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2023
Signed-off-by: Bhavana Ramaram <[email protected]>
(cherry picked from commit 8c3e453)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-1551-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8c3e453a7c3eba68135bf503531d909a12db7537
# Push it to GitHub
git push --set-upstream origin backport/backport-1551-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-1551-to-1.x.

ylwu-amzn pushed a commit that referenced this pull request Oct 26, 2023
Signed-off-by: Bhavana Ramaram <[email protected]>
(cherry picked from commit 8c3e453)

Co-authored-by: Bhavana Ramaram <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 30, 2023
Signed-off-by: Bhavana Ramaram <[email protected]>
(cherry picked from commit 8c3e453)
jngz-es pushed a commit that referenced this pull request Oct 30, 2023
Signed-off-by: Bhavana Ramaram <[email protected]>
(cherry picked from commit 8c3e453)

Co-authored-by: Bhavana Ramaram <[email protected]>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport/backport-1551-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8c3e453a7c3eba68135bf503531d909a12db7537
# Push it to GitHub
git push --set-upstream origin backport/backport-1551-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9

Then, create a pull request where the base branch is 2.9 and the compare/head branch is backport/backport-1551-to-2.9.

TrungBui59 pushed a commit to TrungBui59/ml-commons that referenced this pull request Nov 6, 2023
TrungBui59 pushed a commit to TrungBui59/ml-commons that referenced this pull request Nov 6, 2023
austintlee pushed a commit to austintlee/ml-commons that referenced this pull request Feb 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants