Add json-smart to version catalog#17569
Merged
andrross merged 1 commit intoopensearch-project:mainfrom Mar 11, 2025
Merged
Conversation
Signed-off-by: Daniel Widdis <widdis@gmail.com>
Contributor
|
❕ Gradle check result for a5777e8: UNSTABLE
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
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. 🚀 New features to boost your workflow:
|
peterzhuamazon
approved these changes
Mar 11, 2025
andrross
approved these changes
Mar 11, 2025
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>
Contributor
|
The backport to 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.19Then, create a pull request where the |
1 task
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>
5 tasks
gaobinlong
pushed a commit
that referenced
this pull request
Mar 13, 2025
… in /libs/grok (#17560) (#17572) * Add json-smart to version catalog (#17569) Signed-off-by: Daniel Widdis <widdis@gmail.com> * Bump org.jruby.jcodings:jcodings from 1.0.61 to 1.0.63 in /libs/grok (#17560) * Bump org.jruby.jcodings:jcodings from 1.0.61 to 1.0.63 in /libs/grok Bumps [org.jruby.jcodings:jcodings](https://github.com/jruby/jcodings) from 1.0.61 to 1.0.63. - [Commits](jruby/jcodings@jcodings-1.0.61...jcodings-1.0.63) --- updated-dependencies: - dependency-name: org.jruby.jcodings:jcodings dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Updating SHAs Signed-off-by: dependabot[bot] <support@github.com> * Update changelog Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> --------- Signed-off-by: Daniel Widdis <widdis@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
vinaykpud
pushed a commit
to vinaykpud/OpenSearch
that referenced
this pull request
Mar 18, 2025
Signed-off-by: Daniel Widdis <widdis@gmail.com> Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
andrross
pushed a commit
to andrross/OpenSearch
that referenced
this pull request
Jul 16, 2025
Signed-off-by: Daniel Widdis <widdis@gmail.com> (cherry picked from commit 7094de1)
1 task
cwperks
pushed a commit
that referenced
this pull request
Jul 17, 2025
* Add json-smart to version catalog (#17569) Signed-off-by: Daniel Widdis <widdis@gmail.com> (cherry picked from commit 7094de1) * Update SHA for repository-hdfs Signed-off-by: Andrew Ross <andrross@amazon.com> --------- Signed-off-by: Daniel Widdis <widdis@gmail.com> Signed-off-by: Andrew Ross <andrross@amazon.com> Co-authored-by: Daniel Widdis <widdis@gmail.com>
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
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.
Description
Adds dependency
net.minidev:json-smartto the version catalog.Effectively bumps to 2.5.2 in
/plugins/repository-azure/which was missed by dependabot. Resolves CVE-2024-57699Related 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.