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

Add json-smart to version catalog #17569

Merged
merged 1 commit into from
Mar 11, 2025

Conversation

dbwiddis
Copy link
Member

Description

Adds dependency net.minidev:json-smart to the version catalog.

Effectively bumps to 2.5.2 in /plugins/repository-azure/ which was missed by dependabot. Resolves CVE-2024-57699

Related Issues

Relates to #17564

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.

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Copy link
Contributor

❕ Gradle check result for a5777e8: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.snapshots.DedicatedClusterSnapshotRestoreIT.testSnapshotWithStuckNode
      1 org.opensearch.cluster.MinimumClusterManagerNodesIT.testThreeNodesNoClusterManagerBlock
      1 org.opensearch.backwards.MixedClusterClientYamlTestSuiteIT.test {p0=cluster.health/10_basic/cluster health with closed index}

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Mar 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.49%. Comparing base (2ee8660) to head (a5777e8).
Report is 1 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #17569      +/-   ##
============================================
+ Coverage     72.43%   72.49%   +0.06%     
- Complexity    65694    65781      +87     
============================================
  Files          5311     5311              
  Lines        304937   304937              
  Branches      44226    44226              
============================================
+ Hits         220872   221059     +187     
+ Misses        65912    65771     -141     
+ Partials      18153    18107      -46     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Member

@peterzhuamazon peterzhuamazon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @dbwiddis !

cc @andrross to co-review this one.

Thanks.

@andrross andrross merged commit 7094de1 into opensearch-project:main Mar 11, 2025
63 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 11, 2025
Signed-off-by: Daniel Widdis <widdis@gmail.com>
(cherry picked from commit 7094de1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.19 2.19
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.19
# Create a new branch
git switch --create backport/backport-17569-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7094de1c49d0432f616f9d459a86912780f971ee
# Push it to GitHub
git push --set-upstream origin backport/backport-17569-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.19

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

@dbwiddis dbwiddis deleted the bump-json-smart branch March 11, 2025 16:45
dbwiddis pushed a commit that referenced this pull request Mar 11, 2025
(cherry picked from commit 7094de1)

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis added a commit to dbwiddis/OpenSearch that referenced this pull request Mar 11, 2025
Signed-off-by: Daniel Widdis <widdis@gmail.com>
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